Fixes for dev rlang

Now has stricter definition of `is_expression()` that only allows parse-able calls.
tidyverse · Oct 4, 2021 · 07b93b4 · 07b93b4
1 parent 5b3daf0
commit 07b93b4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -30,7 +30,7 @@ Imports:
     ellipsis,
     glue,
     lifecycle,
-    rlang,
+    rlang (>= 0.4.11.9001),
     tibble,
     tidyselect,
     vctrs
@@ -47,3 +47,5 @@ Encoding: UTF-8
 Roxygen: {library(tidyr); list(markdown = TRUE)}
 RoxygenNote: 7.1.2
 Config/testthat/edition: 3
+Remotes:  
+    r-lib/rlang
diff --git a/R/step-subset.R b/R/step-subset.R
@@ -11,8 +11,8 @@ step_subset <- function(parent,
 ) {
 
   stopifnot(is_step(parent))
-  stopifnot(is.null(i) || is_expression(i) || is_step(i))
-  stopifnot(is.null(j) || is_expression(j))
+  stopifnot(is_expression(i) || is_call(i) || is_step(i))
+  stopifnot(is_expression(j) || is_call(j))
   stopifnot(is.character(on))
 
   new_step(

diff --git a/tests/testthat/_snaps/step-subset-select.md b/tests/testthat/_snaps/step-subset-select.md
@@ -2,6 +2,6 @@
 
     Code
       out <- lz %>% group_by(x) %>% select()
-    Message <message>
+    Message <rlang_message>
       Adding missing grouping variables: `x`
 
diff --git a/tests/testthat/_snaps/step-subset-summarise.md b/tests/testthat/_snaps/step-subset-summarise.md
@@ -3,7 +3,7 @@
     Code
       eval_bare(expr(lazy_dt(data.frame(x = 1, y = 2), "DT") %>% group_by(x, y) %>%
         dplyr::summarise() %>% show_query()), env(global_env()))
-    Message <message>
+    Message <rlang_message>
       `summarise()` has grouped output by 'x'. You can override using the `.groups` argument.
     Output
       unique(DT)