Prefer vec_slice() over [,, drop = FALSE]

Author: krlmlr

R/compat-dplyr.R

@@ -13,13 +13,13 @@ lead <- function(x, n = 1L, default = NA) {
 
 arrange <- function(.data, ...) {
   ord <- eval(substitute(order(...)), .data, parent.frame())
-  .data[ord, , drop = FALSE]
+  vec_slice(.data, ord)
 }
 
 arrange_pos_id <- function(data) {
   pos_id <- data$pos_id
   if (is.unsorted(pos_id)) {
-    data <- data[order(pos_id), , drop = FALSE]
+    data <- vec_slice(data, order(pos_id))
   }
   data
 }
@@ -52,10 +52,6 @@ last <- function(x) {
   x[[length(x)]]
 }
 
-slice <- function(.data, ...) {
-  .data[c(...), , drop = FALSE]
-}
-
 map_dfr <- function(.x, .f, ...) {
   .f <- purrr::as_mapper(.f, ...)
   res <- map(.x, .f, ...)

R/relevel.R

@@ -85,7 +85,7 @@ flatten_pd <- function(pd_nested, token, child_token = token, left = TRUE) {
 #' @keywords internal
 bind_with_child <- function(pd_nested, pos) {
   pd_nested %>%
-    slice(-pos) %>%
+    vec_slice(-pos) %>%
     vec_rbind(pd_nested$child[[pos]]) %>%
     arrange_pos_id()
 }

R/rules-tokens.R

@@ -166,7 +166,7 @@ wrap_subexpr_in_curly <- function(pd,
     remove_attributes(c("token_before", "token_after"))
 
   pd %>%
-    slice(-ind_to_be_wrapped) %>%
+    vec_slice(-ind_to_be_wrapped) %>%
     vec_rbind(new_expr_in_expr) %>%
     set_multi_line() %>%
     arrange_pos_id()