Merge pull request #775 from markfairbanks/simplify-check_across

Simplify `check_no_across()`

R/distinct.R

@@ -32,7 +32,7 @@ distinct <- function(.df, ..., .keep_all = FALSE) {
 distinct.tidytable <- function(.df, ..., .keep_all = FALSE) {
   dots <- enquos(...)
 
-  check_across(dots, "distinct")
+  check_no_across(dots)
 
   if (length(dots) == 0) {
     out <- vec_unique(.df)

R/group_by.R

@@ -35,7 +35,7 @@ group_by <- function(.df, ..., .add = FALSE) {
 #' @export
 group_by.tidytable <- function(.df, ..., .add = FALSE) {
   dots <- enquos(...)
-  check_across(dots, "group_by")
+  check_no_across(dots)
   .groups <- tidyselect_names(.df, !!!dots)
   if (length(.groups) == 0) {
     out <- .df

R/mutate.R

@@ -89,7 +89,7 @@ mutate.tidytable <- function(.df, ..., .by = NULL,
     one_dot <- length(dots) == 1
 
     if (!one_dot) {
-      is_across <- map_lgl(dots[-1], quo_is_call, c("across.", "across"))
+      is_across <- map_lgl(dots[-1], quo_is_call, "across")
       if (any(is_across)) {
         # tidyselect helpers will miss columns made before an across call
         # that is not in the first position

R/utils-general.R

@@ -177,10 +177,11 @@ vec_ptype_compatible <- function(x, y) {
   tryCatch({vec_ptype_common(x, y); TRUE}, error = function(e) FALSE)
 }
 
-check_across <- function(dots, .fn) {
-  uses_across <- any(map_lgl(dots, quo_is_call, c("across", "across.", "pick")))
-
-  if (uses_across) {
+check_no_across <- function(dots) {
+  any_across <- any(map_lgl(dots, quo_is_call, c("across", "pick")))
+  if (any_across) {
+    .fn <- as.character(caller_call()[[1]])
+    .fn <- str_replace(.fn, ".tidytable", "")
     msg <- glue("`across()`/`pick()` are unnecessary in `{.fn}()`.
                 Please directly use tidyselect.
                 Ex: df %>% {.fn}(where(is.numeric))")