lang -> call2

haugstve · Oct 11, 2018 · 8770a56 · 8770a56
1 parent 64c5aeb
commit 8770a56
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 30 deletions.
diff --git a/R/compat-dbplyr.R b/R/compat-dbplyr.R
@@ -28,8 +28,8 @@ wrap_dbplyr_obj <- function(obj_name) {
   obj <- getExportedValue("dbplyr", obj_name)
   obj_sym <- sym(obj_name)
 
-  dbplyr_sym <- lang("::", quote(dbplyr), obj_sym)
-  dplyr_sym <- lang("::", quote(dplyr), obj_sym)
+  dbplyr_sym <- call2("::", quote(dbplyr), obj_sym)
+  dplyr_sym <- call2("::", quote(dplyr), obj_sym)
 
   if (is.function(obj)) {
     args <- formals()

diff --git a/R/funs.R b/R/funs.R
@@ -103,7 +103,7 @@ as_fun <- function(.x, .env, .args) {
   if (is_call(expr) && !is_call(expr, c("::", ":::"))) {
     expr <- lang_modify(expr, !!!.args)
   } else {
-    expr <- lang(expr, quote(.), !!!.args)
+    expr <- call2(expr, quote(.), !!!.args)
   }
 
   set_expr(quo, expr)

diff --git a/docs/articles/compatibility.html b/docs/articles/compatibility.html
diff --git a/docs/dev/articles/compatibility.html b/docs/dev/articles/compatibility.html
diff --git a/tests/testthat/test-funs.R b/tests/testthat/test-funs.R
@@ -17,7 +17,7 @@ test_that("funs() accepts quoted functions", {
 
 test_that("funs() accepts unquoted functions", {
   funs <- funs(fn = !!mean)
-  expect_identical(funs$fn, new_quosure(lang(base::mean, quote(.))))
+  expect_identical(funs$fn, new_quosure(call2(base::mean, quote(.))))
 })
 
 test_that("funs() accepts quoted calls", {

diff --git a/vignettes/compatibility.Rmd b/vignettes/compatibility.Rmd
@@ -160,16 +160,16 @@ fun <- rlang::sym("my_call")
 quo((!!fun)(!!! syms))
 ```
 
-Or create the call with `lang()`:
+Or create the call with `call2()`:
 
 ```{r}
-call <- rlang::lang("my_call", !!! syms)
+call <- rlang::call2("my_call", !!! syms)
 call
 
 rlang::as_quosure(call)
 
 # Or equivalently:
-quo(!! rlang::lang("my_call", !!! syms))
+quo(!! rlang::call2("my_call", !!! syms))
 ```
 
 Note that idioms based on `interp()` should now generally be avoided