Eliminate remotes (#2572)

* Eliminate dev rlang dependency

* Bump to released scales

* Update docs

Author: hadley

DESCRIPTION

@@ -26,8 +26,8 @@ Imports:
     mgcv,
     plyr (>= 1.7.1),
     reshape2,
-    rlang (>= 0.2.0.9001),
-    scales (>= 0.4.1.9002),
+    rlang,
+    scales (>= 0.5.0),
     stats,
     tibble,
     viridisLite,
@@ -54,9 +54,6 @@ Suggests:
     rmarkdown,
     sf (>= 0.3-4),
     svglite (>= 1.2.0.9001)
-Remotes:
-    hadley/scales,
-    r-lib/rlang
 Enhances: sp
 License: GPL-2 | file LICENSE
 URL: http://ggplot2.tidyverse.org, https://github.com/tidyverse/ggplot2
@@ -88,6 +85,7 @@ Collate:
     'backports.R'
     'bench.r'
     'bin.R'
+    'compat-quosures.R'
     'coord-.r'
     'coord-cartesian-.r'
     'coord-fixed.r'

NAMESPACE

@@ -4,6 +4,7 @@ S3method("$",ggproto)
 S3method("$",ggproto_parent)
 S3method("$<-",uneval)
 S3method("+",gg)
+S3method("[",quosures)
 S3method("[",uneval)
 S3method("[<-",uneval)
 S3method("[[",ggproto)
@@ -12,6 +13,7 @@ S3method(.DollarNames,ggproto)
 S3method(as.list,ggproto)
 S3method(autolayer,default)
 S3method(autoplot,default)
+S3method(c,quosures)
 S3method(drawDetails,zeroGrob)
 S3method(element_grob,element_blank)
 S3method(element_grob,element_line)
@@ -95,6 +97,7 @@ S3method(print,ggplot)
 S3method(print,ggplot2_bins)
 S3method(print,ggproto)
 S3method(print,ggproto_method)
+S3method(print,quosures)
 S3method(print,rel)
 S3method(print,theme)
 S3method(print,uneval)

R/compat-quosures.R

@@ -0,0 +1,36 @@
+# TODO: Remove once rlang 0.2.0.9001 or later is on CRAN
+
+new_quosures <- function(x) {
+  if (!rlang::is_list(x)) {
+    stop("Expected a list of quosures")
+  }
+  structure(x,
+    class = "quosures",
+    names = rlang::names2(x)
+  )
+}
+
+as_quosures <- function(x, env, named = FALSE) {
+  x <- lapply(x, rlang::as_quosure, env = env)
+  if (named) {
+    x <- rlang::quos_auto_name(x)
+  }
+  new_quosures(x)
+}
+
+is_quosures <- function(x) {
+  inherits(x, "quosures")
+}
+
+#' @export
+`[.quosures` <- function(x, i) {
+  structure(NextMethod(), class = "quosures")
+}
+#' @export
+c.quosures <- function(..., recursive = FALSE) {
+  new_quosures(NextMethod())
+}
+#' @export
+print.quosures <- function(x, ...) {
+  print(unclass(x), ...)
+}

R/facet-.r

@@ -323,6 +323,9 @@ as_facets_list <- function(x) {
 # Compatibility with plyr::as.quoted()
 as_quoted <- function(x) {
   if (is.character(x)) {
+    if (length(x) > 1) {
+      x <- paste(x, collapse = "; ")
+    }
     return(rlang::parse_exprs(x))
   }
   if (is.null(x)) {
@@ -381,12 +384,12 @@ as_facets <- function(x) {
     f_as_facets(x)
   } else {
     vars <- as_quoted(x)
-    rlang::as_quosures(vars, globalenv(), named = TRUE)
+    as_quosures(vars, globalenv(), named = TRUE)
   }
 }
 f_as_facets <- function(f) {
   if (is.null(f)) {
-    return(rlang::as_quosures(list()))
+    return(as_quosures(list()))
   }
 
   env <- rlang::f_env(f) %||% globalenv()
@@ -397,7 +400,7 @@ f_as_facets <- function(f) {
   # `.` in formulas is ignored
   vars <- discard_dots(vars)
 
-  rlang::as_quosures(vars, env, named = TRUE)
+  as_quosures(vars, env, named = TRUE)
 }
 discard_dots <- function(x) {
   x[!vapply(x, identical, logical(1), as.name("."))]

R/facet-wrap.r

@@ -114,7 +114,7 @@ facet_wrap <- function(facets, nrow = NULL, ncol = NULL, scales = "fixed",
 
   # Flatten all facets dimensions into a single one
   facets_list <- as_facets_list(facets)
-  facets <- rlang::flatten_if(facets_list, is.list)
+  facets <- rlang::flatten_if(facets_list, rlang::is_list)
 
   ggproto(NULL, FacetWrap,
     shrink = shrink,

R/plot-build.r

@@ -275,6 +275,7 @@ ggplot_gtable.ggplot_built <- function(data) {
   if (length(tag_pos) == 2) tag_pos <- "manual"
   valid_pos <- c("topleft", "top", "topright", "left", "right", "bottomleft",
                  "bottom", "bottomright")
+
   if (!(tag_pos == "manual" || tag_pos %in% valid_pos)) {
     stop("plot.tag.position should be a coordinate or one of ",
          paste(valid_pos, collapse = ', '), call. = FALSE)