Drop caller_env from DataMask

NEWS.md

@@ -1,5 +1,8 @@
 # dplyr (development version)
 
+* `group_by_prepare()` loses the `caller_env` argument. It was rarely used
+  and it is no longer needed (#6444).
+
 * `nth()`, `first()`, `last()`, and `with_order()` now sort character `order_by`
   vectors in the C locale. Using character vectors for `order_by` is rare, so we
   expect this to have little practical impact (#6451).

R/across.R

@@ -628,7 +628,7 @@ expand_across <- function(quo) {
     !!cols,
     fns = eval_tidy(expr$.fns, mask, env = env),
     names = eval_tidy(expr$.names, mask, env = env),
-    .caller_env = dplyr_mask$get_caller_env(),
+    .caller_env = env,
     mask = dplyr_mask,
     inline = TRUE
   )

R/data-mask.R

@@ -1,6 +1,6 @@
 DataMask <- R6Class("DataMask",
   public = list(
-    initialize = function(data, caller, verb, error_call) {
+    initialize = function(data, verb, error_call) {
       rows <- group_rows(data)
       if (length(rows) == 0) {
         # Specially handle case of zero groups
@@ -17,7 +17,6 @@ DataMask <- R6Class("DataMask",
       }
       names(data) <- names_bindings
       private$size <- nrow(data)
-      private$caller <- caller
       private$current_data <- unclass(data)
 
       private$chops <- .Call(dplyr_lazy_vec_chop_impl, data, rows)
@@ -185,10 +184,6 @@ DataMask <- R6Class("DataMask",
 
     get_rlang_mask = function() {
       private$mask
-    },
-
-    get_caller_env = function() {
-      private$caller
     }
 
   ),
@@ -226,9 +221,6 @@ DataMask <- R6Class("DataMask",
     grouped_df = NULL,
     rowwise_df = NULL,
 
-    # caller environment of the verb (summarise(), ...)
-    caller = NULL,
-
     verb = character()
   )
 )

R/distinct.R

@@ -88,10 +88,7 @@ distinct_prepare <- function(.data,
   }
 
   # If any calls, use mutate to add new columns, then distinct on those
-  computed_columns <- add_computed_columns(.data, vars,
-    caller_env = caller_env,
-    error_call = error_call
-  )
+  computed_columns <- add_computed_columns(.data, vars, error_call = error_call)
   .data <- computed_columns$data
   distinct_vars <- computed_columns$added_names
 

R/filter.R

@@ -111,17 +111,17 @@ filter <- function(.data, ..., .preserve = FALSE) {
 
 #' @export
 filter.data.frame <- function(.data, ..., .preserve = FALSE) {
-  loc <- filter_rows(.data, ..., caller_env = caller_env())
+  loc <- filter_rows(.data, ...)
   dplyr_row_slice(.data, loc, preserve = .preserve)
 }
 
-filter_rows <- function(.data, ..., caller_env, error_call = caller_env()) {
+filter_rows <- function(.data, ..., error_call = caller_env()) {
   error_call <- dplyr_error_call(error_call)
 
   dots <- dplyr_quosures(...)
   check_filter(dots, error_call = error_call)
 
-  mask <- DataMask$new(.data, caller_env, "filter", error_call = error_call)
+  mask <- DataMask$new(.data, "filter", error_call = error_call)
   on.exit(mask$forget(), add = TRUE)
 
   dots <- filter_expand(dots, mask = mask, error_call = error_call)

R/group-by.r

@@ -141,7 +141,6 @@ group_by.data.frame <- function(.data, ..., .add = FALSE, .drop = group_by_drop_
     .data,
     ...,
     .add = .add,
-    caller_env = caller_env(),
     error_call = current_env()
   )
   grouped_df(groups$data, groups$group_names, .drop)
@@ -192,7 +191,6 @@ ungroup.data.frame <- function(x, ...) {
 #' @keywords internal
 group_by_prepare <- function(.data,
                              ...,
-                             caller_env = caller_env(2),
                              .add = FALSE,
                              .dots = deprecated(),
                              add = deprecated(),
@@ -208,14 +206,11 @@ group_by_prepare <- function(.data,
   if (!missing(.dots)) {
     # Used by dbplyr 1.4.2 so can't aggressively deprecate
     lifecycle::deprecate_warn("1.0.0", "group_by(.dots = )", always = TRUE)
-    new_groups <- c(new_groups, compat_lazy_dots(.dots, env = caller_env))
+    new_groups <- c(new_groups, compat_lazy_dots(.dots, env = caller_env(2)))
   }
 
   # If any calls, use mutate to add new columns, then group by those
-  computed_columns <- add_computed_columns(.data, new_groups,
-    caller_env = caller_env,
-    error_call = error_call
-  )
+  computed_columns <- add_computed_columns(.data, new_groups, error_call = error_call)
 
   out <- computed_columns$data
   group_names <- computed_columns$added_names
@@ -242,7 +237,6 @@ group_by_prepare <- function(.data,
 
 add_computed_columns <- function(.data,
                                  vars,
-                                 caller_env,
                                  error_call = caller_env()) {
   is_symbol <- map_lgl(vars, quo_is_variable_reference)
   needs_mutate <- have_name(vars) | !is_symbol
@@ -253,7 +247,6 @@ add_computed_columns <- function(.data,
       cols <- mutate_cols(
         ungroup(.data),
         dplyr_quosures(!!!vars),
-        caller_env = caller_env,
         error_call = error_call
       )
 

R/mutate.R

@@ -172,7 +172,7 @@ mutate.data.frame <- function(.data,
                               .after = NULL) {
   keep <- arg_match(.keep)
 
-  cols <- mutate_cols(.data, dplyr_quosures(...), caller_env = caller_env())
+  cols <- mutate_cols(.data, dplyr_quosures(...))
   used <- attr(cols, "used")
 
   out <- dplyr_col_modify(.data, cols)
@@ -218,13 +218,13 @@ mutate.data.frame <- function(.data,
 
 # Helpers -----------------------------------------------------------------
 
-mutate_cols <- function(.data, dots, caller_env, error_call = caller_env()) {
+mutate_cols <- function(.data, dots, error_call = caller_env()) {
   # Collect dots before setting up error handlers (#6178)
   force(dots)
 
   error_call <- dplyr_error_call(error_call)
 
-  mask <- DataMask$new(.data, caller_env, "mutate", error_call = error_call)
+  mask <- DataMask$new(.data, "mutate", error_call = error_call)
   old_current_column <- context_peek_bare("column")
 
   on.exit(context_poke("column", old_current_column), add = TRUE)

R/slice.R

@@ -123,7 +123,7 @@ slice <- function(.data, ..., .preserve = FALSE) {
 
 #' @export
 slice.data.frame <- function(.data, ..., .preserve = FALSE) {
-  loc <- slice_rows(.data, ..., caller_env = caller_env(), error_call = current_env())
+  loc <- slice_rows(.data, ..., error_call = current_env())
   dplyr_row_slice(.data, loc, preserve = .preserve)
 }
 
@@ -270,14 +270,14 @@ slice_sample.data.frame <- function(.data, ..., n, prop, weight_by = NULL, repla
 
 # helpers -----------------------------------------------------------------
 
-slice_rows <- function(.data, ..., caller_env, error_call = caller_env()) {
+slice_rows <- function(.data, ..., error_call = caller_env()) {
   error_call <- dplyr_error_call(error_call)
 
   dots <- enquos(...)
   if (is_empty(dots)) {
     return(TRUE)
   }
-  mask <- DataMask$new(.data, caller_env, "slice", error_call = error_call)
+  mask <- DataMask$new(.data, "slice", error_call = error_call)
   on.exit(mask$forget(), add = TRUE)
 
   chunks <- slice_eval(mask, dots, error_call = error_call)

R/summarise.R

@@ -125,7 +125,7 @@ summarize <- summarise
 
 #' @export
 summarise.data.frame <- function(.data, ..., .groups = NULL) {
-  cols <- summarise_cols(.data, dplyr_quosures(...), caller_env = caller_env())
+  cols <- summarise_cols(.data, dplyr_quosures(...))
   out <- summarise_build(.data, cols)
   if (identical(.groups, "rowwise")) {
     out <- rowwise_df(out, character())
@@ -135,7 +135,7 @@ summarise.data.frame <- function(.data, ..., .groups = NULL) {
 
 #' @export
 summarise.grouped_df <- function(.data, ..., .groups = NULL) {
-  cols <- summarise_cols(.data, dplyr_quosures(...), caller_env = caller_env())
+  cols <- summarise_cols(.data, dplyr_quosures(...))
   out <- summarise_build(.data, cols)
   verbose <- summarise_verbose(.groups, caller_env())
 
@@ -178,7 +178,7 @@ summarise.grouped_df <- function(.data, ..., .groups = NULL) {
 
 #' @export
 summarise.rowwise_df <- function(.data, ..., .groups = NULL) {
-  cols <- summarise_cols(.data, dplyr_quosures(...), caller_env = caller_env())
+  cols <- summarise_cols(.data, dplyr_quosures(...))
   out <- summarise_build(.data, cols)
   verbose <- summarise_verbose(.groups, caller_env())
 
@@ -202,10 +202,10 @@ summarise.rowwise_df <- function(.data, ..., .groups = NULL) {
   out
 }
 
-summarise_cols <- function(.data, dots, caller_env, error_call = caller_env()) {
+summarise_cols <- function(.data, dots, error_call = caller_env()) {
   error_call <- dplyr_error_call(error_call)
 
-  mask <- DataMask$new(.data, caller_env, "summarise", error_call = error_call)
+  mask <- DataMask$new(.data, "summarise", error_call = error_call)
   old_current_column <- context_peek_bare("column")
 
   on.exit(context_poke("column", old_current_column), add = TRUE)

R/transmute.R

@@ -39,7 +39,7 @@ transmute.data.frame <- function(.data, ...) {
   dots <- check_transmute_args(...)
   dots <- dplyr_quosures(!!!dots)
 
-  cols <- mutate_cols(.data, dots, caller_env = caller_env())
+  cols <- mutate_cols(.data, dots)
 
   out <- dplyr_col_modify(.data, cols)
 

tests/testthat/helper-dplyr.R

@@ -4,15 +4,3 @@ expect_no_error <- function(object, ...) {
 expect_no_warning <- function(object, ...) {
   expect_warning({{ object }}, NA, ...)
 }
-
-sig_caller_env <- function() {
-  signal(
-    "",
-    "dplyr:::test_caller_env",
-    out = peek_mask()$get_caller_env()
-  )
-}
-expect_caller_env <- function(expr) {
-  env <- catch_cnd(expr, "dplyr:::test_caller_env")$out
-  expect_equal(env, caller_env())
-}

tests/testthat/test-across.R

@@ -89,10 +89,15 @@ test_that("across(.unpack =) allows a glue specification for `.unpack`", {
   }
 
   df <- tibble(x = 1)
-
   out <- mutate(df, across(x, fn, .unpack = "{outer}.{inner}"))
-
   expect_named(out, c("x", "x.a", "x.b"))
+
+  # Can use variables from caller env
+  out <- local({
+    name <- "name"
+    mutate(df, across(x, fn, .unpack = "{name}.{inner}"))
+  })
+  expect_named(out, c("x", "name.a", "name.b"))
 })
 
 test_that("across(.unpack =) skips unpacking non-df-cols", {
@@ -908,7 +913,7 @@ test_that("expand_across() expands lambdas", {
     index = 1
   )
 
-  DataMask$new(mtcars, current_env(), "mutate", call("caller"))
+  DataMask$new(mtcars, "mutate", call("caller"))
 
   expect_equal(
     map(expand_across(quo), quo_get_expr),
@@ -929,7 +934,7 @@ test_that("expand_if_across() expands lambdas", {
     index = 1
   )
 
-  DataMask$new(mtcars, current_env(), "mutate", call("caller"))
+  DataMask$new(mtcars, "mutate", call("caller"))
 
   expect_equal(
     map(expand_if_across(quo), quo_squash),

tests/testthat/test-distinct.R

@@ -158,10 +158,6 @@ test_that("distinct preserves grouping", {
   expect_equal(group_vars(out), "x")
 })
 
-test_that("distinct() propagates caller env", {
-  expect_caller_env(distinct(mtcars, sig_caller_env()))
-})
-
 test_that("distinct() preserves attributes on bare data frames (#6318)", {
   df <- vctrs::data_frame(x = c(1, 1))
   attr(df, "foo") <- "bar"

tests/testthat/test-group-by.r

@@ -588,10 +588,6 @@ test_that("group_by() works with quosures (tidyverse/lubridate#959)", {
   expect_equal(g(), tibble(x = 1, g = NA) %>% group_by(g))
 })
 
-test_that("group_by() propagates caller env", {
-  expect_caller_env(group_by(mtcars, sig_caller_env()))
-})
-
 
 # Errors ------------------------------------------------------------------
 

tests/testthat/test-mutate.r

@@ -581,10 +581,6 @@ test_that("mutate() supports empty list columns in rowwise data frames (#5804",
   expect_equal(res$n, integer())
 })
 
-test_that("mutate() propagates caller env", {
-  expect_caller_env(mutate(mtcars, sig_caller_env()))
-})
-
 test_that("mutate() fails on named empty arguments (#5925)", {
   expect_error(
     mutate(tibble(), bogus = )

tests/testthat/test-summarise.r

@@ -217,12 +217,6 @@ test_that("summarise() silently skips when all results are NULL (#5708)", {
   expect_error(summarise(df, x = if(g == 1) 42))
 })
 
-test_that("summarise() propagates caller env", {
-  expect_caller_env(summarise(mtcars, sig_caller_env()))
-  expect_caller_env(summarise(group_by(mtcars, cyl), sig_caller_env()))
-})
-
-
 # errors -------------------------------------------------------------------
 
 test_that("summarise() preserves the call stack on error (#5308)", {