Use quosure accessors

Author: lionel-

R/expect-invisible.R

@@ -21,7 +21,7 @@
 #' out <- expect_invisible(greet("Hadley"))
 #' expect_equal(out, "Hadley")
 expect_invisible <- function(call, label = NULL) {
-  lab <- label %||% expr_label(get_expr(enquo(call)))
+  lab <- label %||% expr_label(enexpr(call))
   vis <- withVisible(call)
 
   expect(
@@ -34,7 +34,7 @@ expect_invisible <- function(call, label = NULL) {
 #' @export
 #' @rdname expect_invisible
 expect_visible <- function(call, label = NULL) {
-  lab <- label %||% expr_label(get_expr(enquo(call)))
+  lab <- label %||% expr_label(enexpr(call))
   vis <- withVisible(call)
 
   expect(

R/quasi-label.R

@@ -40,16 +40,18 @@ quasi_label <- function(quo, label = NULL, arg = "quo") {
     stop("argument `", arg, "` is missing, with no default.", call. = FALSE)
   }
 
+  expr <- quo_get_expr(quo)
+
   list(
-    val = eval_bare(get_expr(quo), get_env(quo)),
-    lab = label %||% expr_label(get_expr(quo))
+    val = eval_bare(expr, quo_get_env(quo)),
+    lab = label %||% expr_label(expr)
   )
 }
 
 quasi_capture <- function(.quo, .label, .capture, ...) {
   act <- list()
   act$lab <- .label %||% quo_label(.quo)
-  act$cap <- .capture(act$val <- eval_bare(get_expr(.quo), get_env(.quo)), ...)
+  act$cap <- .capture(act$val <- eval_bare(quo_get_expr(.quo), quo_get_env(.quo)), ...)
 
   act
 }

R/verify-output.R

@@ -28,8 +28,8 @@
 verify_output <- function(path, code, width = 80, crayon = FALSE) {
   code <- enquo(code)
 
-  env <- get_env(code)
-  expr <- get_expr(code)
+  env <- quo_get_env(code)
+  expr <- quo_get_expr(code)
 
   if (is_call(expr, "{")) {
     exprs <- as.list(expr[-1])