Adds support of rlang::list2 dynamic dots (#4764)

Fixes #4752
tidyverse · Apr 19, 2022 · 379597d · 379597d
1 parent 00b762d
commit 379597d
Show file tree

Hide file tree

Showing 73 changed files with 84 additions and 82 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # ggplot2 (development version)
 
+* `...` supports `rlang::list2` dynamic dots in all public functions. (@mone27, #4764) 
+
 * `theme()` now has a `strip.clip` argument, that can be set to `"off"` to 
   prevent the clipping of strip text and background borders (@teunbrand, #4118)
 

diff --git a/R/geom-abline.r b/R/geom-abline.r
@@ -112,7 +112,7 @@ geom_abline <- function(mapping = NULL, data = NULL,
     position = PositionIdentity,
     show.legend = show.legend,
     inherit.aes = FALSE,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       ...
     )

diff --git a/R/geom-bar.r b/R/geom-bar.r
@@ -96,7 +96,7 @@ geom_bar <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       width = width,
       na.rm = na.rm,
       orientation = orientation,

diff --git a/R/geom-bin2d.r b/R/geom-bin2d.r
@@ -39,7 +39,7 @@ geom_bin_2d <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       ...
     )

diff --git a/R/geom-blank.r b/R/geom-blank.r
@@ -23,7 +23,7 @@ geom_blank <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(...),
+    params = list2(...),
     check.aes = FALSE
   )
 }

diff --git a/R/geom-boxplot.r b/R/geom-boxplot.r
@@ -141,7 +141,7 @@ geom_boxplot <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       outlier.colour = outlier.color %||% outlier.colour,
       outlier.fill = outlier.fill,
       outlier.shape = outlier.shape,

diff --git a/R/geom-col.r b/R/geom-col.r
@@ -16,7 +16,7 @@ geom_col <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       width = width,
       na.rm = na.rm,
       ...

diff --git a/R/geom-contour.r b/R/geom-contour.r
@@ -93,7 +93,7 @@ geom_contour <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       bins = bins,
       binwidth = binwidth,
       breaks = breaks,
@@ -125,7 +125,7 @@ geom_contour_filled <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       bins = bins,
       binwidth = binwidth,
       breaks = breaks,

diff --git a/R/geom-count.r b/R/geom-count.r
@@ -55,7 +55,7 @@ geom_count <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       ...
     )

diff --git a/R/geom-crossbar.r b/R/geom-crossbar.r
@@ -16,7 +16,7 @@ geom_crossbar <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       fatten = fatten,
       na.rm = na.rm,
       orientation = orientation,

diff --git a/R/geom-curve.r b/R/geom-curve.r
@@ -21,7 +21,7 @@ geom_curve <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       arrow = arrow,
       arrow.fill = arrow.fill,
       curvature = curvature,

diff --git a/R/geom-density.r b/R/geom-density.r
@@ -69,7 +69,7 @@ geom_density <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       orientation = orientation,
       outline.type = outline.type,

diff --git a/R/geom-density2d.r b/R/geom-density2d.r
@@ -81,7 +81,7 @@ geom_density_2d <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       lineend = lineend,
       linejoin = linejoin,
       linemitre = linemitre,
@@ -124,7 +124,7 @@ geom_density_2d_filled <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       contour = TRUE,
       contour_var = contour_var,

diff --git a/R/geom-dotplot.r b/R/geom-dotplot.r
@@ -159,7 +159,7 @@ geom_dotplot <- function(mapping = NULL, data = NULL,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
     # Need to make sure that the binaxis goes to both the stat and the geom
-    params = list(
+    params = list2(
       binaxis = binaxis,
       binwidth = binwidth,
       binpositions = binpositions,

diff --git a/R/geom-errorbar.r b/R/geom-errorbar.r
@@ -15,7 +15,7 @@ geom_errorbar <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       orientation = orientation,
       ...

diff --git a/R/geom-errorbarh.r b/R/geom-errorbarh.r
@@ -38,7 +38,7 @@ geom_errorbarh <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       ...
     )

diff --git a/R/geom-freqpoly.r b/R/geom-freqpoly.r
@@ -7,7 +7,7 @@ geom_freqpoly <- function(mapping = NULL, data = NULL,
                           show.legend = NA,
                           inherit.aes = TRUE) {
 
-  params <- list(na.rm = na.rm, ...)
+  params <- list2(na.rm = na.rm, ...)
   if (identical(stat, "bin")) {
     params$pad <- TRUE
   }

diff --git a/R/geom-function.R b/R/geom-function.R
@@ -67,7 +67,7 @@ geom_function <- function(mapping = NULL, data = NULL, stat = "function",
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       ...
     )

diff --git a/R/geom-hex.r b/R/geom-hex.r
@@ -41,7 +41,7 @@ geom_hex <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       ...
     )

diff --git a/R/geom-histogram.r b/R/geom-histogram.r
@@ -131,7 +131,7 @@ geom_histogram <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       binwidth = binwidth,
       bins = bins,
       na.rm = na.rm,

diff --git a/R/geom-hline.r b/R/geom-hline.r
@@ -32,7 +32,7 @@ geom_hline <- function(mapping = NULL, data = NULL,
     position = PositionIdentity,
     show.legend = show.legend,
     inherit.aes = FALSE,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       ...
     )

diff --git a/R/geom-jitter.r b/R/geom-jitter.r
@@ -57,7 +57,7 @@ geom_jitter <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       ...
     )

diff --git a/R/geom-label.R b/R/geom-label.R
@@ -31,7 +31,7 @@ geom_label <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       parse = parse,
       label.padding = label.padding,
       label.r = label.r,

diff --git a/R/geom-linerange.r b/R/geom-linerange.r
@@ -78,7 +78,7 @@ geom_linerange <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       orientation = orientation,
       ...

diff --git a/R/geom-map.r b/R/geom-map.r
@@ -92,7 +92,7 @@ geom_map <- function(mapping = NULL, data = NULL,
     position = PositionIdentity,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       map = map,
       na.rm = na.rm,
       ...

diff --git a/R/geom-path.r b/R/geom-path.r
@@ -112,7 +112,7 @@ geom_path <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       lineend = lineend,
       linejoin = linejoin,
       linemitre = linemitre,
@@ -248,7 +248,7 @@ geom_line <- function(mapping = NULL, data = NULL, stat = "identity",
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       orientation = orientation,
       ...
@@ -293,7 +293,7 @@ geom_step <- function(mapping = NULL, data = NULL, stat = "identity",
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       direction = direction,
       na.rm = na.rm,
       ...

diff --git a/R/geom-point.r b/R/geom-point.r
@@ -97,7 +97,7 @@ geom_point <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       ...
     )

diff --git a/R/geom-pointrange.r b/R/geom-pointrange.r
@@ -16,7 +16,7 @@ geom_pointrange <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       fatten = fatten,
       na.rm = na.rm,
       orientation = orientation,

diff --git a/R/geom-polygon.r b/R/geom-polygon.r
@@ -93,7 +93,7 @@ geom_polygon <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       rule = rule,
       ...

diff --git a/R/geom-quantile.r b/R/geom-quantile.r
@@ -47,7 +47,7 @@ geom_quantile <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       lineend = lineend,
       linejoin = linejoin,
       linemitre = linemitre,

diff --git a/R/geom-raster.r b/R/geom-raster.r
@@ -29,7 +29,7 @@ geom_raster <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       hjust = hjust,
       vjust = vjust,
       interpolate = interpolate,

diff --git a/R/geom-rect.r b/R/geom-rect.r
@@ -15,7 +15,7 @@ geom_rect <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       linejoin = linejoin,
       na.rm = na.rm,
       ...

diff --git a/R/geom-ribbon.r b/R/geom-ribbon.r
@@ -59,7 +59,7 @@ geom_ribbon <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       orientation = orientation,
       outline.type = outline.type,
@@ -214,7 +214,7 @@ geom_area <- function(mapping = NULL, data = NULL, stat = "identity",
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       na.rm = na.rm,
       orientation = orientation,
       outline.type = outline.type,

diff --git a/R/geom-rug.r b/R/geom-rug.r
@@ -70,7 +70,7 @@ geom_rug <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       outside = outside,
       sides = sides,
       length = length,

diff --git a/R/geom-segment.r b/R/geom-segment.r
@@ -85,7 +85,7 @@ geom_segment <- function(mapping = NULL, data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       arrow = arrow,
       arrow.fill = arrow.fill,
       lineend = lineend,

diff --git a/R/geom-sf.R b/R/geom-sf.R
@@ -230,7 +230,7 @@ geom_sf <- function(mapping = aes(), data = NULL, stat = "sf",
       position = position,
       show.legend = show.legend,
       inherit.aes = inherit.aes,
-      params = list(
+      params = list2(
         na.rm = na.rm,
         ...
       )
@@ -273,7 +273,7 @@ geom_sf_label <- function(mapping = aes(), data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       parse = parse,
       label.padding = label.padding,
       label.r = label.r,
@@ -317,7 +317,7 @@ geom_sf_text <- function(mapping = aes(), data = NULL,
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(
+    params = list2(
       parse = parse,
       check_overlap = check_overlap,
       na.rm = na.rm,

diff --git a/R/geom-smooth.r b/R/geom-smooth.r
@@ -93,7 +93,7 @@ geom_smooth <- function(mapping = NULL, data = NULL,
                         show.legend = NA,
                         inherit.aes = TRUE) {
 
-  params <- list(
+  params <- list2(
     na.rm = na.rm,
     orientation = orientation,
     se = se,