Merge pull request #1215 from r-lib/use-stable-purrr

r-lib · May 23, 2024 · ad1cac1 · ad1cac1
2 parents 3394099 + 9e9d8ec
commit ad1cac1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -27,7 +27,7 @@ Depends:
 Imports: 
     cli (>= 3.1.1),
     magrittr (>= 2.0.0),
-    purrr (>= 0.2.3),
+    purrr (>= 1.0.2),
     R.cache (>= 0.15.0),
     rlang (>= 1.0.0),
     rprojroot (>= 1.1),

diff --git a/R/compat-dplyr.R b/R/compat-dplyr.R
@@ -10,12 +10,6 @@ lead <- function(x, n = 1L, default = NA) {
   c(x[-seq_len(n)], rep(default, n))
 }
 
-
-arrange <- function(.data, ...) {
-  ord <- eval(substitute(order(...)), .data, parent.frame())
-  vec_slice(.data, ord)
-}
-
 arrange_pos_id <- function(data) {
   pos_id <- data$pos_id
   if (is.unsorted(pos_id)) {
@@ -51,9 +45,3 @@ left_join <- function(x, y, by) {
 last <- function(x) {
   x[[length(x)]]
 }
-
-map_dfr <- function(.x, .f, ...) {
-  .f <- purrr::as_mapper(.f, ...)
-  res <- map(.x, .f, ...)
-  vec_rbind(!!!res)
-}
diff --git a/R/visit.R b/R/visit.R
@@ -233,10 +233,11 @@ enrich_terminals <- function(flattened_pd, use_raw_indention = FALSE) {
   groups <- flattened_pd$line1
   split_pd <- vec_split(flattened_pd, groups)[[2L]]
   flattened_pd <- split_pd %>%
-    map_dfr(function(.x) {
+    purrr::map(function(.x) {
       .x$col2 <- cumsum(.x$nchar + .x$lag_spaces)
       .x
-    })
+    }) %>%
+    purrr::list_rbind()
   flattened_pd$col1 <- flattened_pd$col2 - flattened_pd$nchar
   flattened_pd
 }