Merge branch 'main' into patch-8

Author: olivroy

.Rbuildignore

@@ -24,3 +24,4 @@
 ^\.vscode$
 ^compile_commands\.json$
 .*\.clangd$
+^[\.]?air\.toml$

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: rlang
-Version: 1.1.4.9000
+Version: 1.1.6.9000
 Title: Functions for Base Types and Core R and 'Tidyverse' Features
 Description: A toolbox for working with base types, core R features
   like the condition system, and core 'Tidyverse' features like tidy
@@ -8,12 +8,12 @@ Authors@R: c(
     person("Lionel", "Henry", ,"[email protected]", c("aut", "cre")),
     person("Hadley", "Wickham", ,"[email protected]", "aut"),
     person(given = "mikefc",
-           email = "[email protected]", 
-           role = "cph", 
+           email = "[email protected]",
+           role = "cph",
            comment = "Hash implementation based on Mike's xxhashlite"),
     person(given = "Yann",
            family = "Collet",
-           role = "cph", 
+           role = "cph",
            comment = "Author of the embedded xxHash library"),
     person(given = "Posit, PBC", role = c("cph", "fnd"))
     )
@@ -28,20 +28,22 @@ Suggests:
     cli (>= 3.1.0),
     covr,
     crayon,
+    desc,
     fs,
     glue,
     knitr,
     magrittr,
     methods,
     pillar,
+    pkgload,
     rmarkdown,
     stats,
-    testthat (>= 3.0.0),
+    testthat (>= 3.2.0),
     tibble,
     usethis,
     vctrs (>= 0.2.3),
     withr
-Enhances: 
+Enhances:
     winch
 Encoding: UTF-8
 RoxygenNote: 7.3.2

NEWS.md

@@ -1,12 +1,22 @@
 # rlang (development version)
 
+# rlang 1.1.6
+
+* Fixes for CRAN checks.
+
+* Progress towards making rlang conformant with the public C API of R.
+
 * `env_browse()` and `env_is_browsed()` are now defunct as they require an API
   that is no longer available to packages (#1727).
 
+* The SEXP iterator of the rlang C library (used in r-lib/memtools) is now
+  behind a feature flag because it requires private API accessors. Compile
+  rlang with `-DRLANG_USE_PRIVATE_ACCESSORS` to enable it.
+
 * `env_unlock()` is now defunct because recent versions of R no long
   make it possible to unlock an environment (#1705). Make sure to use an
   up-to-date version of pkgload (>= 1.4.0) following this change.
-  
+
 * `is_dictionaryish()` now will return TRUE for NULL (@ilovemane, #1712).
 
 

R/aaa-topics.R

@@ -2,48 +2,32 @@ titles <- list(
   # NSE
 
   ## Overviews
-  topic_data_mask =
-    "What is data-masking and why do I need `{{`?",
-  topic_data_mask_programming =
-    "Data mask programming patterns",
-  topic_metaprogramming =
-    "Metaprogramming patterns",
-  topic_defuse =
-    "Defusing R expressions",
-  topic_inject =
-    "Injecting with `!!`, `!!!`, and glue syntax",
-  topic_quosure =
-    "What are quosures and when are they needed?",
+  topic_data_mask = "What is data-masking and why do I need `{{`?",
+  topic_data_mask_programming = "Data mask programming patterns",
+  topic_metaprogramming = "Metaprogramming patterns",
+  topic_defuse = "Defusing R expressions",
+  topic_inject = "Injecting with `!!`, `!!!`, and glue syntax",
+  topic_quosure = "What are quosures and when are they needed?",
 
   ## Guides
-  topic_data_mask_ambiguity =
-    "The data mask ambiguity",
-  topic_double_evaluation =
-    "The double evaluation problem",
-  topic_multiple_columns =
-    "Taking multiple columns without `...`",
+  topic_data_mask_ambiguity = "The data mask ambiguity",
+  topic_double_evaluation = "The double evaluation problem",
+  topic_multiple_columns = "Taking multiple columns without `...`",
 
   ## Notes
-  topic_embrace_non_args =
-    "Does `{{` work on regular objects?",
-  topic_embrace_constants =
-    "Why are strings and other constants enquosed in the empty environment?",
-  topic_inject_out_of_context =
-    "What happens if I use injection operators out of context?",
+  topic_embrace_non_args = "Does `{{` work on regular objects?",
+  topic_embrace_constants = "Why are strings and other constants enquosed in the empty environment?",
+  topic_inject_out_of_context = "What happens if I use injection operators out of context?",
 
   # Errors
 
   ## Guides
-  topic_error_call =
-    "Including function calls in error messages",
-  topic_error_chaining =
-    "Including contextual information with error chains",
-  topic_condition_formatting =
-    "Formatting messages with cli",
+  topic_error_call = "Including function calls in error messages",
+  topic_error_chaining = "Including contextual information with error chains",
+  topic_condition_formatting = "Formatting messages with cli",
 
   ## Notes
-  topic_condition_customisation =
-    "Customising condition messages"
+  topic_condition_customisation = "Customising condition messages"
 )
 
 sprintf_topic_link <- function(id, topic = NULL) {
@@ -71,9 +55,15 @@ sprintf_topic_link <- function(id, topic = NULL) {
 links <- lapply(names(titles), sprintf_topic_link)
 names(links) <- names(titles)
 
-links[["{{"]] <- "\\ifelse{html}{\\code{\\link[=embrace-operator]{\\{\\{}}}{\\verb{\\{\\{}}"
-links[["'{{'"]] <- "\\ifelse{html}{\\code{\\link[=glue-operators]{\"\\{\\{\"}}}{\\verb{\"\\{\\{\"}}"
-links[["'{'"]] <- "\\ifelse{html}{\\code{\\link[=glue-operators]{\"\\{\"}}}{\\verb{\"\\{\"}}"
+links[[
+  "{{"
+]] <- "\\ifelse{html}{\\code{\\link[=embrace-operator]{\\{\\{}}}{\\verb{\\{\\{}}"
+links[[
+  "'{{'"
+]] <- "\\ifelse{html}{\\code{\\link[=glue-operators]{\"\\{\\{\"}}}{\\verb{\"\\{\\{\"}}"
+links[[
+  "'{'"
+]] <- "\\ifelse{html}{\\code{\\link[=glue-operators]{\"\\{\"}}}{\\verb{\"\\{\"}}"
 
 title <- function(id) {
   out <- titles[[id]]

R/aaa.R

@@ -75,7 +75,7 @@ the <- new.env(parent = emptyenv())
 #'
 #' @examples
 #' quote({  # Not run
-#' 
+#'
 #' # First add `run_on_load()` to your `.onLoad()` hook,
 #' # then use `on_load()` anywhere in your package
 #' .onLoad <- function(lib, pkg) {

R/arg.R

@@ -28,12 +28,14 @@
 #' # Throws an informative error for mismatches:
 #' try(fn("b"))
 #' try(fn("baz"))
-arg_match <- function(arg,
-                      values = NULL,
-                      ...,
-                      multiple = FALSE,
-                      error_arg = caller_arg(arg),
-                      error_call = caller_env()) {
+arg_match <- function(
+  arg,
+  values = NULL,
+  ...,
+  multiple = FALSE,
+  error_arg = caller_arg(arg),
+  error_call = caller_env()
+) {
   check_dots_empty0(...)
 
   arg_expr <- enexpr(arg)
@@ -99,10 +101,12 @@ arg_match_multi <- function(arg, values, error_arg, error_call) {
 #' fn1()
 #' fn2("bar")
 #' try(fn3("zoo"))
-arg_match0 <- function(arg,
-                       values,
-                       arg_nm = caller_arg(arg),
-                       error_call = caller_env()) {
+arg_match0 <- function(
+  arg,
+  values,
+  arg_nm = caller_arg(arg),
+  error_call = caller_env()
+) {
   .External(ffi_arg_match0, arg, values, environment())
 }
 
@@ -192,9 +196,7 @@ arg_match_invalid_msg <- function(val, values, error_arg) {
 #' # Succeeds
 #' f(NULL)
 #' @export
-check_required <- function(x,
-                           arg = caller_arg(x),
-                           call = caller_env()) {
+check_required <- function(x, arg = caller_arg(x), call = caller_env()) {
   if (!missing(x)) {
     return(invisible(TRUE))
   }
@@ -255,10 +257,12 @@ chr_quoted <- function(chr, type = "`") {
 #' }
 #' f()
 #' @export
-check_exclusive <- function(...,
-                            .require = TRUE,
-                            .frame = caller_env(),
-                            .call = .frame) {
+check_exclusive <- function(
+  ...,
+  .require = TRUE,
+  .frame = caller_env(),
+  .call = .frame
+) {
   args <- enexprs(..., .named = TRUE)
   if (length(args) < 2) {
     abort("Must supply at least two arguments.")

R/attr.R

@@ -122,7 +122,6 @@ is_dictionaryish <- function(x) {
 }
 
 
-
 #' Does an object have an element with this name?
 #'
 #' This function returns a logical value that indicates if a data

R/bytes.R

@@ -121,13 +121,13 @@ byte_units <- c(
   'B' = 1,
   'k' = 1000,
   'K' = 1000,
-  'M' = 1000 ^ 2,
-  'G' = 1000 ^ 3,
-  'T' = 1000 ^ 4,
-  'P' = 1000 ^ 5,
-  'E' = 1000 ^ 6,
-  'Z' = 1000 ^ 7,
-  'Y' = 1000 ^ 8
+  'M' = 1000^2,
+  'G' = 1000^3,
+  'T' = 1000^4,
+  'P' = 1000^5,
+  'E' = 1000^6,
+  'Z' = 1000^7,
+  'Y' = 1000^8
 )
 
 captures <- function(x, m) {
@@ -227,7 +227,7 @@ max.rlib_bytes <- function(x, ...) {
 
 #' @export
 # Adapted from Ops.numeric_version
-Ops.rlib_bytes <- function (e1, e2) {
+Ops.rlib_bytes <- function(e1, e2) {
   if (nargs() == 1L) {
     abort(sprintf("unary `%s` not defined for <rlib_bytes> objects", .Generic))
   }

R/c-lib.R

@@ -145,6 +145,10 @@ detect_rlang_lib_usage <- function(src_path) {
   FALSE
 }
 
+has_private_accessors <- function() {
+  .Call(ffi_has_private_accessors)
+}
+
 
 # cnd.c
 
@@ -401,5 +405,5 @@ vec_resize <- function(x, n) {
 # walk.c
 
 sexp_iterate <- function(x, fn) {
-  .Call(ffi_sexp_iterate, x, fn)
+  do.call(".Call", list(get("ffi_sexp_iterate"), x, fn))
 }