Feature/remove tibble (#435)

* Bump R version to allow usage of |>

* Fix tibble usage in cran-compliance

* Fix find_exports

* Fix sanitize code

* Fix function options

* Draft NEWS

* Drop {tibble} dependency

* Record PR in docs

* Lint

* Update Rtools versions

* Use Rtools 45

Author: Ilia-Kosenkov

.github/workflows/R-CMD-check.yaml

@@ -21,9 +21,9 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: windows-latest, r: 'release', rust-version: 'stable-msvc', rust-target: 'x86_64-pc-windows-gnu' }
-          - {os: windows-latest, r: 'devel',   rust-version: 'stable-msvc', rust-target: 'x86_64-pc-windows-gnu' }
-          - {os: windows-latest, r: 'oldrel',  rust-version: 'stable-msvc', rust-target: 'x86_64-pc-windows-gnu', rtools-version: '43' }
+          - {os: windows-latest, r: 'release', rust-version: 'stable-msvc', rust-target: 'x86_64-pc-windows-gnu', rtools-version: '45' }
+          - {os: windows-latest, r: 'devel',   rust-version: 'stable-msvc', rust-target: 'x86_64-pc-windows-gnu', rtools-version: '45' }
+          - {os: windows-latest, r: 'oldrel',  rust-version: 'stable-msvc', rust-target: 'x86_64-pc-windows-gnu', rtools-version: '44' }
 
           - {os: macOS-latest,   r: 'release', rust-version: 'stable' }
 

DESCRIPTION

@@ -37,7 +37,7 @@ License: MIT + file LICENSE
 URL: https://extendr.github.io/rextendr/
 BugReports: https://github.com/extendr/rextendr/issues
 Depends:
-    R (>= 4.0)
+    R (>= 4.1)
 Imports:
     brio,
     callr,
@@ -51,7 +51,6 @@ Imports:
     rlang (>= 1.0.5),
     rprojroot,
     stringi,
-    tibble,
     vctrs,
     withr
 Suggests:

NEWS.md

@@ -28,6 +28,8 @@
 * Added `read_cargo_metadata()` to retrieve Cargo metadata for packages and
   workspaces. (#389)
 * `rustup_sitrep()` now checks if a default toolchain has been set. <https://github.com/extendr/rextendr/pull/416>
+* Minimum R version is set to `4.1` (#435)
+* `{tibble}` is no longer a dependency (#435)
 
 # rextend 0.3.1
 

R/cran-compliance.R

@@ -81,20 +81,20 @@ vendor_pkgs <- function(path = ".", quiet = FALSE, overwrite = NULL) {
   }
 
   # create a dataframe of vendored crates
-  vendored <- vendor_res[["stderr"]] %>%
-    cli::ansi_strip() %>%
+  vendored <- vendor_res[["stderr"]] |>
+    cli::ansi_strip() |>
     stringi::stri_split_lines1()
 
-  res <- stringi::stri_match_first_regex(vendored, "Vendoring\\s([A-z0-9_][A-z0-9_-]*?)\\s[vV](.+?)(?=\\s)") %>%
-    tibble::as_tibble(.name_repair = "minimal") %>%
-    rlang::set_names(c("source", "crate", "version")) %>%
-    dplyr::filter(!is.na(source)) %>%
-    dplyr::select(-source) %>%
+  res <- stringi::stri_match_first_regex(vendored, "Vendoring\\s([A-z0-9_][A-z0-9_-]*?)\\s[vV](.+?)(?=\\s)") |>
+    as.data.frame() |>
+    rlang::set_names(c("source", "crate", "version")) |>
+    dplyr::filter(!is.na(source)) |>
+    dplyr::select(-source) |>
     dplyr::arrange(.data$crate)
 
   # capture vendor-config.toml content
-  config_toml <- vendor_res[["stdout"]] %>%
-    cli::ansi_strip() %>%
+  config_toml <- vendor_res[["stdout"]] |>
+    cli::ansi_strip() |>
     stringi::stri_split_lines1()
 
   # always write to file as cargo vendor catches things like patch.crates-io

R/find_exports.R

@@ -5,13 +5,13 @@ find_exports <- function(clean_lns) {
 
   # start and end may empty
   if (rlang::is_empty(start) || rlang::is_empty(end)) {
-    return(tibble::tibble(name = character(0), type = character(0), lifetime = character(0)))
+    return(data.frame(name = character(0), type = character(0), lifetime = character(0)))
   }
 
-  map2(start, end, ~ extract_meta(clean_lns[.x:.y])) %>%
-    discard(~ is.na(.x["impl"]) & is.na(.x["fn"])) %>%
-    dplyr::bind_rows() %>%
-    dplyr::mutate(type = dplyr::coalesce(.data$impl, .data$fn)) %>%
+  map2(start, end, \(.x, .y) extract_meta(clean_lns[.x:.y])) |>
+    discard(\(.x) is.na(.x["impl"]) & is.na(.x["fn"])) |>
+    dplyr::bind_rows() |>
+    dplyr::mutate(type = dplyr::coalesce(.data$impl, .data$fn)) |>
     dplyr::select(dplyr::all_of(c("name", "type", "lifetime")))
 }
 
@@ -27,9 +27,9 @@ extract_meta <- function(lns) {
   result <- stringi::stri_match_first_regex(
     glue_collapse(lns, sep = "\n"),
     "(?:(?<struct>struct)|(?<enum>enum)|(?<fn>fn)|(?<impl>impl)(?:\\s*<(?<lifetime>.+?)>)?)\\s+(?<name>(?:r#)?(?:_\\w+|[A-z]\\w*))" # nolint: line_length_linter
-  ) %>%
-    tibble::as_tibble(.name_repair = "minimal") %>%
-    rlang::set_names(c("match", "struct", "enum", "fn", "impl", "lifetime", "name")) %>%
+  ) |>
+    as.data.frame() |>
+    rlang::set_names(c("match", "struct", "enum", "fn", "impl", "lifetime", "name")) |>
     dplyr::filter(!is.na(.data$match))
 
   # If no matches have been found, then the attribute is misplaced

R/function_options.R

@@ -1,9 +1,11 @@
 extendr_function_config <- rlang::env(
-  known_options = tibble::tribble(
-    ~Name, ~Ptype,
-    "r_name", character(),
-    "mod_name", character(),
-    "use_rng", logical()
+  known_options = data.frame(
+    Name = c("r_name", "mod_name", "use_rng"),
+    Ptype = I(list(
+      character(),
+      character(),
+      logical()
+    ))
   )
 )
 
@@ -14,7 +16,7 @@ extendr_function_config <- rlang::env(
 #' @noRd
 convert_function_options <- function(options, suppress_warnings) {
   if (rlang::is_null(options) || rlang::is_empty(options)) {
-    return(tibble::tibble(Name = character(), RustValue = character()))
+    return(data.frame(Name = character(), RustValue = character()))
   }
 
   if (!rlang::is_list(options) || !rlang::is_named(options)) {
@@ -24,25 +26,25 @@ convert_function_options <- function(options, suppress_warnings) {
     )
   }
 
-  options_table <- tibble::tibble(Name = rlang::names2(options), Value = unname(options)) %>%
-    dplyr::left_join(extendr_function_config$known_options, by = "Name") %>%
+  options_table <- data.frame(Name = rlang::names2(options), Value = I(unname(options))) |>
+    dplyr::left_join(extendr_function_config$known_options, by = "Name") |>
     dplyr::mutate(
       Value = pmap(
         list(.data$Value, .data$Ptype, .data$Name),
-        ~ if (rlang::is_null(..2)) ..1 else vctrs::vec_cast(..1, ..2, x_arg = ..3)
+        \(...) if (rlang::is_null(..2)) ..1 else vctrs::vec_cast(..1, ..2, x_arg = ..3)
       ),
     )
 
-  unknown_option_names <- options_table %>%
-    dplyr::filter(map_lgl(.data$Ptype, rlang::is_null)) %>%
+  unknown_option_names <- options_table |>
+    dplyr::filter(map_lgl(.data$Ptype, rlang::is_null)) |>
     dplyr::pull(.data$Name)
 
-  invalid_options <- options_table %>%
+  invalid_options <- options_table |>
     dplyr::mutate(
       IsNameInvalid = !is_valid_rust_name(.data$Name),
       IsValueNull = map_lgl(.data$Value, rlang::is_null),
       IsNotScalar = !.data$IsValueNull & !map_lgl(.data$Value, vctrs::vec_is, size = 1L)
-    ) %>%
+    ) |>
     dplyr::filter(
       .data$IsNameInvalid | .data$IsValueNull | .data$IsNotScalar
     )
@@ -56,7 +58,7 @@ convert_function_options <- function(options, suppress_warnings) {
     ))
   }
 
-  options_table %>%
+  options_table |>
     dplyr::transmute(
       .data$Name,
       RustValue = map_chr(.data$Value, convert_option_to_rust)
@@ -70,18 +72,18 @@ convert_function_options <- function(options, suppress_warnings) {
 cli_abort_invalid_options <- function(invalid_options) {
   n_invalid_opts <- vctrs::vec_size(invalid_options) # nolint: object_usage_linter
 
-  invalid_names <- invalid_options %>% get_option_names(.data$IsNameInvalid)
-  null_values <- invalid_options %>% get_option_names(.data$IsValueNull)
-  vector_values <- invalid_options %>% get_option_names(.data$IsNotScalar)
+  invalid_names <- invalid_options |> get_option_names(.data$IsNameInvalid)
+  null_values <- invalid_options |> get_option_names(.data$IsValueNull)
+  vector_values <- invalid_options |> get_option_names(.data$IsNotScalar)
 
   message <- c(
     "Found {.val {n_invalid_opts}} invalid {.code extendr} function option{?s}:",
-    x = "Unsupported name{?s}: {.val {invalid_names}}." %>% if_any_opts(invalid_names),
-    x = "Null value{?s}: {.val {null_values}}." %>% if_any_opts(null_values),
-    x = "Vector value{?s}: {.val {vector_values}}." %>% if_any_opts(vector_values),
-    i = "Option names should be valid rust names." %>% if_any_opts(invalid_names),
-    i = "{.code NULL} values are disallowed." %>% if_any_opts(null_values),
-    i = "Only scalars are allowed as option values." %>% if_any_opts(vector_values)
+    x = "Unsupported name{?s}: {.val {invalid_names}}." |> if_any_opts(invalid_names),
+    x = "Null value{?s}: {.val {null_values}}." |> if_any_opts(null_values),
+    x = "Vector value{?s}: {.val {vector_values}}." |> if_any_opts(vector_values),
+    i = "Option names should be valid rust names." |> if_any_opts(invalid_names),
+    i = "{.code NULL} values are disallowed." |> if_any_opts(null_values),
+    i = "Only scalars are allowed as option values." |> if_any_opts(vector_values)
   )
 
   cli::cli_abort(message, class = "rextendr_error")
@@ -93,8 +95,8 @@ cli_abort_invalid_options <- function(invalid_options) {
 #' @return A character vector of option names.
 #' @noRd
 get_option_names <- function(invalid_options, filter_column) {
-  invalid_options %>%
-    dplyr::filter({{ filter_column }}) %>%
+  invalid_options |>
+    dplyr::filter({{ filter_column }}) |>
     dplyr::pull(.data$Name)
 }
 

R/sanitize_code.R

@@ -1,8 +1,8 @@
 sanitize_rust_code <- function(lines) {
-  lines %>%
-    remove_empty_or_whitespace() %>%
-    fill_block_comments() %>%
-    remove_line_comments() %>%
+  lines |>
+    remove_empty_or_whitespace() |>
+    fill_block_comments() |>
+    remove_line_comments() |>
     remove_empty_or_whitespace()
 }
 
@@ -34,16 +34,18 @@ fill_block_comments <- function(lns, fill_with = " ") { # nolint: object_usage_l
 
   # A sorted DF having `start`, `end`, and `type`
   comment_syms <-
-    locations %>%
-    map(tibble::as_tibble) %>%
+    locations |>
+    map(as.data.frame) |>
     imap(
-      ~ dplyr::mutate(
-        .x,
-        type = dplyr::if_else(.y == 1L, "open", "close")
-      )
-    ) %>%
-    dplyr::bind_rows() %>%
-    dplyr::filter(!is.na(.data$start)) %>%
+      \(.x, .y) {
+        dplyr::mutate(
+          .x,
+          type = dplyr::if_else(.y == 1L, "open", "close")
+        )
+      }
+    ) |>
+    dplyr::bind_rows() |>
+    dplyr::filter(!is.na(.data$start)) |>
     dplyr::arrange(.data$start)
 
   # Fast path if no comments are found at all.
@@ -98,10 +100,10 @@ fill_block_comments <- function(lns, fill_with = " ") { # nolint: object_usage_l
   # and the next delimiter starts the new block, so we include both, as well as
   # the first in the table.
   to_replace <-
-    valid_syms %>%
+    valid_syms |>
     dplyr::mutate(
       cnt = cumsum(dplyr::if_else(.data$type == "open", +1L, -1L))
-    ) %>%
+    ) |>
     dplyr::filter(
       dplyr::lag(.data$cnt) == 0 | .data$cnt == 0 | dplyr::row_number() == 1
     )
@@ -127,9 +129,9 @@ fill_block_comments <- function(lns, fill_with = " ") { # nolint: object_usage_l
     )
   }
   # Manual `pivot_wider`.
-  to_replace <- tibble::tibble(
+  to_replace <- data.frame(
     start_open = dplyr::filter(to_replace, .data$type == "open")[["start"]],
-    end_close = dplyr::filter(to_replace, .data$type == "close")[["end"]],
+    end_close = dplyr::filter(to_replace, .data$type == "close")[["end"]]
   )
 
   # Replaces each continuous commnet block with whitespaces

R/source.R

@@ -316,7 +316,9 @@ invoke_cargo <- function(toolchain, specific_target, dir, profile,
 
       minor_patch <- package_version(R.version$minor)
 
-      if (minor_patch >= "4.0") {
+      if (minor_patch >= "5.0") {
+        rtools_version <- "45" # nolint: object_usage_linter
+      } else if (minor_patch >= "4.0") {
         rtools_version <- "44" # nolint: object_usage_linter
       } else if (minor_patch >= "3.0") {
         rtools_version <- "43" # nolint: object_usage_linter

tests/testthat/_snaps/cran-compliance.md

@@ -14,17 +14,15 @@
     Code
       package_versions
     Output
-      # A tibble: 10 x 2
-         crate          version
-         <chr>          <chr>  
-       1 build-print    *.*.*
-       2 extendr-api    *.*.*
-       3 extendr-ffi    *.*.*
-       4 extendr-macros *.*.*
-       5 once_cell      *.*.*
-       6 paste          *.*.*
-       7 proc-macro2    *.*.*
-       8 quote          *.*.*
-       9 syn            *.*.*
-      10 unicode-ident  *.*.*
+                  crate version
+      1     build-print   *.*.*
+      2     extendr-api   *.*.*
+      3     extendr-ffi   *.*.*
+      4  extendr-macros   *.*.*
+      5       once_cell  *.*.*
+      6           paste  *.*.*
+      7     proc-macro2  *.*.*
+      8           quote  *.*.*
+      9             syn *.*.*
+      10  unicode-ident  *.*.*
 

tests/testthat/test-make-module-macro.R

@@ -148,7 +148,7 @@ test_that("Rust metadata capturing", {
 
   expect_equal(
     extract_meta("#[extendr] pub \tfn\t      test_fn  \t() {}"),
-    tibble::tibble(
+    data.frame(
       match = "fn\t      test_fn",
       struct = NA_character_,
       enum = NA_character_,
@@ -164,7 +164,7 @@ test_that("Rust metadata capturing", {
       "#[extendr]",
       "pub impl  <'a, \t 'b>  X   <a', 'b> {}"
     )),
-    tibble::tibble(
+    data.frame(
       match = "impl  <'a, \t 'b>  X",
       struct = NA_character_,
       enum = NA_character_,