Merge pull request #488 from rstudio/tidy-eval

Author: wch

DESCRIPTION

@@ -33,7 +33,7 @@ Imports:
     shiny (>= 0.11.1),
     magrittr,
     dplyr (>= 0.5.0),
-    lazyeval,
+    rlang,
     htmltools (>= 0.2.4),
     methods
 Suggests:

NAMESPACE

@@ -8,8 +8,8 @@ S3method(apply_scale_defaults,scale_datetime)
 S3method(apply_scale_defaults,scale_nominal)
 S3method(apply_scale_defaults,scale_numeric)
 S3method(apply_scale_defaults,scale_ordinal)
-S3method(arrange_,ggvis)
-S3method(arrange_,reactive)
+S3method(arrange,ggvis)
+S3method(arrange,reactive)
 S3method(as.character,prop_band)
 S3method(as.character,prop_constant)
 S3method(as.character,prop_reactive)
@@ -65,15 +65,13 @@ S3method(constant_vars,grouped_df)
 S3method(data_range,character)
 S3method(data_range,default)
 S3method(data_range,factor)
-S3method(distinct_,ggvis)
-S3method(distinct_,reactive)
+S3method(distinct,ggvis)
+S3method(distinct,reactive)
 S3method(empty,default)
 S3method(explain,ggvis)
 S3method(extract_reactives,default)
 S3method(extract_reactives,ggvis_props)
 S3method(extract_reactives,prop_reactive)
-S3method(filter_,ggvis)
-S3method(filter_,reactive)
 S3method(format,ggvis_axis)
 S3method(format,ggvis_legend)
 S3method(format,ggvis_props)
@@ -94,14 +92,14 @@ S3method(formula,prop)
 S3method(fullseq,Date)
 S3method(fullseq,POSIXt)
 S3method(fullseq,numeric)
-S3method(group_by_,ggvis)
-S3method(group_by_,reactive)
+S3method(group_by,ggvis)
+S3method(group_by,reactive)
 S3method(groups,ggvis)
 S3method(groups,reactive)
 S3method(max_rows,data.frame)
 S3method(max_rows,grouped_df)
-S3method(mutate_,ggvis)
-S3method(mutate_,reactive)
+S3method(mutate,ggvis)
+S3method(mutate,reactive)
 S3method(new_prop,band)
 S3method(new_prop,call)
 S3method(new_prop,default)
@@ -142,24 +140,24 @@ S3method(prop_vega,prop_variable)
 S3method(remove_missing,data.frame)
 S3method(remove_missing,default)
 S3method(remove_missing,split_df)
-S3method(rename_,ggvis)
-S3method(rename_,reactive)
+S3method(rename,ggvis)
+S3method(rename,reactive)
 S3method(rep,singular)
 S3method(scale_countable,default)
 S3method(scale_countable,scale_datetime)
 S3method(scale_countable,scale_logical)
 S3method(scale_countable,scale_nominal)
 S3method(scale_countable,scale_numeric)
 S3method(scale_countable,scale_ordinal)
-S3method(select_,ggvis)
-S3method(select_,reactive)
-S3method(slice_,ggvis)
-S3method(slice_,reactive)
-S3method(summarise_,ggvis)
-S3method(summarise_,reactive)
+S3method(select,ggvis)
+S3method(select,reactive)
+S3method(slice,ggvis)
+S3method(slice,reactive)
+S3method(summarise,ggvis)
+S3method(summarise,reactive)
 S3method(to_csv,data.frame)
-S3method(transmute_,ggvis)
-S3method(transmute_,reactive)
+S3method(transmute,ggvis)
+S3method(transmute,reactive)
 S3method(ungroup,ggvis)
 S3method(ungroup,reactive)
 S3method(value,default)
@@ -309,19 +307,17 @@ export(view_static)
 export(waggle)
 export(zero_range)
 import(assertthat)
-importFrom(dplyr,arrange_)
-importFrom(dplyr,distinct_)
+importFrom(dplyr,arrange)
+importFrom(dplyr,distinct)
 importFrom(dplyr,explain)
-importFrom(dplyr,filter_)
 importFrom(dplyr,group_by)
-importFrom(dplyr,group_by_)
 importFrom(dplyr,groups)
-importFrom(dplyr,mutate_)
-importFrom(dplyr,rename_)
-importFrom(dplyr,select_)
-importFrom(dplyr,slice_)
-importFrom(dplyr,summarise_)
-importFrom(dplyr,transmute_)
+importFrom(dplyr,mutate)
+importFrom(dplyr,rename)
+importFrom(dplyr,select)
+importFrom(dplyr,slice)
+importFrom(dplyr,summarise)
+importFrom(dplyr,transmute)
 importFrom(dplyr,ungroup)
 importFrom(magrittr,"%>%")
 importFrom(shiny,reactive)

NEWS.md

@@ -1,5 +1,7 @@
 # ggvis 0.4.6
 
+* Switched from lazyeval to tidy eval (#487).
+
 * Fixed #483: Basic example did not work in R 4.0. (#485)
 
 # ggvis 0.4.5

R/compute_auto_group.R

@@ -40,5 +40,5 @@ auto_group <- function(vis, exclude = NULL) {
   if (!any(countable)) return(vis)
 
   group_vars <- lapply(unname(props[countable]), "[[", "value")
-  dplyr::group_by_(vis, .dots = group_vars)
+  dplyr::group_by(vis, !!!group_vars)
 }

R/compute_stack.R

@@ -49,7 +49,7 @@ compute_stack.grouped_df <- function(x, stack_var = NULL, group_var = NULL) {
 
   x <- dplyr::ungroup(x)
   x <- compute_stack(x, stack_var, group_var)
-  x <- dplyr::group_by_(x, .dots = old_groups)
+  x <- dplyr::group_by(x, !!!old_groups)
 
   x
 }
@@ -59,28 +59,16 @@ compute_stack.data.frame <- function(x, stack_var = NULL, group_var = NULL) {
   assert_that(is.formula(stack_var), is.formula(group_var))
 
   # Round grouping variable to 8 significant digits
-  gvar <- lazyeval::interp(~round_fp(x), x = group_var[[2]])
-  x <- dplyr::group_by_(x, group__ = gvar)
+  x <- dplyr::group_by(x, group__ = round_fp(!!group_var[[2]]))
 
-  # FIXME: mutate evaluates in this function's environment, which isn't right.
-  # This is like mutate(x, stack_upr_ = cumsum(stack_var[[2]]),
-  #                     stack_lwr_ = lag(stack_upr_, default = 0))
-  # but with value of stack_var in the right place.
+  # Quiet R CMD check note
+  stack_upr_ <- NULL
 
-  # dplyr 0.4.2 overrides lag instead of overriding default method AND
-  # preserves attributes so we don't want to use base lag
-  if (utils::packageVersion("dplyr") < "0.4.2") {
-    args <- list(
-      stack_upr_ = bquote(cumsum(.(stack_var[[2]]))),
-      stack_lwr_ = bquote(lag(stack_upr_, default = 0))
-    )
-  } else {
-    args <- list(
-      stack_upr_ = bquote(cumsum(.(stack_var[[2]]))),
-      stack_lwr_ = bquote(dplyr::lag(stack_upr_, default = 0))
-    )
-  }
-  x <- dplyr::mutate_(x, .dots = lazyeval::as.lazy_dots(args, asNamespace("ggvis")))
+  # FIXME: mutate evaluates in this function's environment, which isn't right.
+  x <- dplyr::mutate(x,
+    stack_upr_ = cumsum(!!stack_var[[2]]),
+    stack_lwr_ = dplyr::lag(stack_upr_, default = 0)
+  )
 
   dplyr::ungroup(x)
 }