Prefer vec_rbind() over bind_rows()

Author: krlmlr

NAMESPACE

@@ -52,3 +52,4 @@ importFrom(rlang,is_installed)
 importFrom(rlang,seq2)
 importFrom(rlang,set_names)
 importFrom(rlang,warn)
+importFrom(vctrs,vec_rbind)

R/compat-dplyr.R

@@ -24,30 +24,6 @@ arrange_pos_id <- function(data) {
   data
 }
 
-bind_rows <- function(x, y = NULL, ...) {
-  if (is.null(x) && is.null(y)) {
-    return(new_styler_df(list()))
-  }
-  if (is.null(x)) {
-    if (inherits(y, "data.frame")) {
-      return(y)
-    }
-    return(do.call(rbind.data.frame, x))
-  }
-  if (is.null(y)) {
-    if (inherits(x, "data.frame")) {
-      return(x)
-    }
-    return(do.call(rbind.data.frame, x))
-  }
-  if (NCOL(x) != NCOL(y)) {
-    for (nme in setdiff(names(x), names(y))) {
-      y[[nme]] <- NA
-    }
-  }
-  bind_rows(rbind.data.frame(x, y), ...)
-}
-
 filter <- function(.data, ...) {
   subset(.data, ...)
 }
@@ -80,9 +56,8 @@ slice <- function(.data, ...) {
   .data[c(...), , drop = FALSE]
 }
 
-# TODO: Use `purrr::map_dfr()` when it stops implicitly relying on `{dplyr}`
-map_dfr <- function(.x, .f, ..., .id = NULL) {
+map_dfr <- function(.x, .f, ...) {
   .f <- purrr::as_mapper(.f, ...)
   res <- map(.x, .f, ...)
-  bind_rows(res, .id = .id)
+  vec_rbind(!!!res)
 }

R/nest.R

@@ -367,12 +367,12 @@ nest_parse_data <- function(pd_flat) {
 #' the correct order.
 #' @param child A parse table or `NULL`.
 #' @param internal_child A parse table or `NULL`.
-#' @details Essentially, this is a wrapper around [dplyr::bind_rows()], but
-#'   returns `NULL` if the result of [dplyr::bind_rows()] is a data frame with
+#' @details Essentially, this is a wrapper around vctrs::vec_rbind()], but
+#'   returns `NULL` if the result of vctrs::vec_rbind()] is a data frame with
 #'   zero rows.
 #' @keywords internal
 combine_children <- function(child, internal_child) {
-  bound <- bind_rows(child, internal_child)
+  bound <- vec_rbind(child, internal_child)
   if (nrow(bound) == 0L) {
     return(NULL)
   }

R/parse.R

@@ -167,7 +167,7 @@ ensure_correct_txt <- function(pd, text) {
     names(new_text),
     paste0(line_col_names(), "parent")
   )
-  bind_rows(
+  vec_rbind(
     new_text[, names_to_keep],
     pd[is_unaffected_token, ],
     pd[is_parent_of_problematic_string, ]

R/reindent.R

@@ -108,6 +108,6 @@ set_regex_indention <- function(flattened_pd,
     flatten_int()
 
   to_check$lag_spaces[indices_to_force] <- target_indention
-  bind_rows(to_check, not_to_check) %>%
+  vec_rbind(to_check, not_to_check) %>%
     arrange_pos_id()
 }

R/relevel.R

@@ -86,7 +86,7 @@ flatten_pd <- function(pd_nested, token, child_token = token, left = TRUE) {
 bind_with_child <- function(pd_nested, pos) {
   pd_nested %>%
     slice(-pos) %>%
-    bind_rows(pd_nested$child[[pos]]) %>%
+    vec_rbind(pd_nested$child[[pos]]) %>%
     arrange_pos_id()
 }
 
@@ -228,7 +228,7 @@ relocate_eq_assign_one <- function(pd) {
   eq_expr$parent <- NA
   pd$indent <- NULL
   non_eq_expr <- pd[-eq_ind, ]
-  pd <- bind_rows(eq_expr, non_eq_expr) %>%
+  pd <- vec_rbind(eq_expr, non_eq_expr) %>%
     arrange_pos_id()
   pd
 }

R/rules-tokens.R

@@ -51,10 +51,7 @@ add_brackets_in_pipe_one <- function(pd, pos) {
       block = NA,
       is_cached = FALSE
     )
-    pd$child[[next_non_comment]] <- bind_rows(
-      pd$child[[next_non_comment]],
-      new_pd
-    ) %>%
+    pd$child[[next_non_comment]] <- vec_rbind(pd$child[[next_non_comment]], new_pd) %>%
       arrange_pos_id()
   }
   pd
@@ -170,7 +167,7 @@ wrap_subexpr_in_curly <- function(pd,
 
   pd %>%
     slice(-ind_to_be_wrapped) %>%
-    bind_rows(new_expr_in_expr) %>%
+    vec_rbind(new_expr_in_expr) %>%
     set_multi_line() %>%
     arrange_pos_id()
 }
@@ -204,7 +201,7 @@ fix_quotes <- function(pd_flat) {
     return(pd_flat)
   }
 
-  pd_flat$text[str_const] <- map(pd_flat$text[str_const], fix_quotes_one)
+  pd_flat$text[str_const] <- map_chr(pd_flat$text[str_const], fix_quotes_one)
   pd_flat
 }
 

R/styler-package.R

@@ -18,14 +18,14 @@
 #' style_text("a%>%b; a", scope = "tokens")
 "_PACKAGE"
 
-## styler namespace: start
+## usethis namespace: start
 #'
-#' @importFrom rlang abort warn seq2 is_installed "%||%" set_names
-#' @importFrom purrr map map_lgl map_int map_chr map2 map2_chr map_at pmap pwalk
-#' @importFrom purrr compact partial flatten flatten_int flatten_chr
 #' @importFrom magrittr "%>%"
-#'
-## styler namespace: end
+#' @importFrom purrr compact partial flatten flatten_int flatten_chr
+#' @importFrom purrr map map_lgl map_int map_chr map2 map2_chr map_at pmap pwalk
+#' @importFrom rlang abort warn seq2 is_installed "%||%" set_names
+#' @importFrom vctrs vec_rbind
+## usethis namespace: end
 NULL
 
 

R/token-create.R

@@ -191,6 +191,6 @@ wrap_expr_in_curly <- function(pd,
     indents = pd$indent[1L]
   )
 
-  bind_rows(opening, pd, closing) %>%
+  vec_rbind(opening, pd, closing) %>%
     set_multi_line()
 }

R/unindent.R

@@ -32,7 +32,7 @@ set_unindention_child <- function(pd, token = "')'", unindent_by) {
     unindent_by = abs(pd$indent[closing] - pd$indent[closing - 1L])
   )
 
-  bind_rows(candidates, non_candidates) %>%
+  vec_rbind(candidates, non_candidates) %>%
     arrange_pos_id()
 }