Bump deprecations (#6138)

* `deprecate_stop()` for everything prior to ggplot2 3.0.0

* stuff before 3.2.0 becomes proper warning

* add news bullet

* document

* use tidy eval idioms to replace old idioms

* run revdepcheck

* use dynamic deprecation strategy in `fix_bin_params()`

* just treat old elements as any other misspelled element

* Get more in-your-face about deprecating size in favour of linewidth

* bump `qplot()`

* Turn `fix_labeller()` into a check function

* bump version in bullet

---------

Co-authored-by: Thomas Lin Pedersen <[email protected]>

Author: teunbrand

NEWS.md

@@ -1,5 +1,9 @@
 # ggplot2 (development version)
 
+* Deprecated functions and arguments prior to ggplot2 3.0.0 throw errors instead 
+  of warnings. 
+* Functions and arguments that were soft-deprecated up to ggplot2 3.4.0 now 
+  throw warnings.
 * (internal) layer data can be attenuated with parameter attributes 
   (@teunbrand, #3175).
 * Date scales silently coerce <POSIXct> to <Date> and datetime scales silently

R/aes.R

@@ -290,7 +290,7 @@ is_position_aes <- function(vars) {
 #'
 #' @export
 aes_ <- function(x, y, ...) {
-  deprecate_soft0(
+  deprecate_warn0(
     "3.0.0",
     "aes_()",
     details = "Please use tidy evaluation idioms with `aes()`"
@@ -317,7 +317,7 @@ aes_ <- function(x, y, ...) {
 #' @rdname aes_
 #' @export
 aes_string <- function(x, y, ...) {
-  deprecate_soft0(
+  deprecate_warn0(
     "3.0.0",
     "aes_string()",
     details = c(
@@ -374,29 +374,7 @@ aes_all <- function(vars) {
 #' @keywords internal
 #' @export
 aes_auto <- function(data = NULL, ...) {
-  deprecate_warn0("2.0.0", "aes_auto()")
-
-  # detect names of data
-  if (is.null(data)) {
-    cli::cli_abort("{.fn aes_auto} requires a {.cls data.frame} or names of data.frame.")
-  } else if (is.data.frame(data)) {
-    vars <- names(data)
-  } else {
-    vars <- data
-  }
-
-  # automatically detected aes
-  vars <- intersect(ggplot_global$all_aesthetics, vars)
-  names(vars) <- vars
-  aes <- lapply(vars, function(x) parse(text = x)[[1]])
-
-  # explicitly defined aes
-  if (length(match.call()) > 2) {
-    args <- as.list(match.call()[-1])
-    aes <- c(aes, args[names(args) != "data"])
-  }
-
-  structure(rename_aes(aes), class = "uneval")
+  lifecycle::deprecate_stop("2.0.0", "aes_auto()")
 }
 
 mapped_aesthetics <- function(x) {

R/annotation-custom.R

@@ -80,7 +80,7 @@ GeomCustomAnn <- ggproto("GeomCustomAnn", Geom,
     editGrob(grob, vp = vp, name = paste(grob$name, annotation_id()))
   },
 
-  default_aes = aes_(xmin = -Inf, xmax = Inf, ymin = -Inf, ymax = Inf)
+  default_aes = aes(xmin = -Inf, xmax = Inf, ymin = -Inf, ymax = Inf)
 )
 
 annotation_id <- local({

R/bin.R

@@ -240,18 +240,24 @@ bin_loc <- function(x, id) {
   )
 }
 
-fix_bin_params = function(params, fun, version) {
+fix_bin_params <- function(params, fun, version) {
+
+  if (package_version(version) < "3.0.0") {
+    deprecate <- lifecycle::deprecate_stop
+  } else {
+    deprecate <- deprecate_warn0
+  }
 
   if (!is.null(params$origin)) {
     args <- paste0(fun, c("(origin)", "(boundary)"))
-    deprecate_warn0(version, args[1], args[2])
-    params$boudnary <- params$origin
+    deprecate(version, args[1], args[2])
+    params$boundary <- params$origin
     params$origin <- NULL
   }
 
   if (!is.null(params$right)) {
     args <- paste0(fun, c("(right)", "(closed)"))
-    deprecate_warn0(version, args[1], args[2])
+    deprecate(version, args[1], args[2])
     params$closed <- if (isTRUE(params$right)) "right" else "left"
     params$right <- NULL
   }

R/facet-grid-.R

@@ -132,10 +132,9 @@ facet_grid <- function(rows = NULL, cols = NULL, scales = "fixed",
                        switch = NULL, drop = TRUE, margins = FALSE,
                        axes = "margins", axis.labels = "all",
                        facets = deprecated()) {
-  # `facets` is deprecated and renamed to `rows`
+  # `facets` is deprecated
   if (lifecycle::is_present(facets)) {
-    deprecate_warn0("2.2.0", "facet_grid(facets)", "facet_grid(rows)")
-    rows <- facets
+    lifecycle::deprecate_stop("2.2.0", "facet_grid(facets)", "facet_grid(rows)")
   }
 
   # Should become a warning in a future release
@@ -177,7 +176,7 @@ facet_grid <- function(rows = NULL, cols = NULL, scales = "fixed",
   facets_list <- grid_as_facets_list(rows, cols)
 
   # Check for deprecated labellers
-  labeller <- fix_labeller(labeller)
+  check_labeller(labeller)
 
   ggproto(NULL, FacetGrid,
     shrink = shrink,

R/facet-wrap.R

@@ -174,14 +174,15 @@ facet_wrap <- function(facets, nrow = NULL, ncol = NULL, scales = "fixed",
   )
 
   # Check for deprecated labellers
-  labeller <- fix_labeller(labeller)
+  check_labeller(labeller)
 
   # Flatten all facets dimensions into a single one
   facets <- compact_facets(facets)
 
   if (lifecycle::is_present(switch) && !is.null(switch)) {
-    deprecate_warn0("2.2.0", "facet_wrap(switch)", "facet_wrap(strip.position)")
-    strip.position <- if (switch == "x") "bottom" else "left"
+    lifecycle::deprecate_stop(
+      "2.2.0", "facet_wrap(switch)", "facet_wrap(strip.position)"
+    )
   }
   strip.position <- arg_match0(strip.position, c("top", "bottom", "left", "right"))
 

R/fortify-map.R

@@ -159,6 +159,6 @@ map_data <- function(map, region = ".", exact = FALSE, ...) {
 borders <- function(database = "world", regions = ".", fill = NA,
                     colour = "grey50", xlim = NULL, ylim = NULL, ...) {
   df <- map_data(database, regions, xlim = xlim, ylim = ylim)
-  geom_polygon(aes_(~long, ~lat, group = ~group), data = df,
+  geom_polygon(aes(.data$long, .data$lat, group = .data$group), data = df,
     fill = fill, colour = colour, ..., inherit.aes = FALSE)
 }

R/geom-.R

@@ -126,7 +126,7 @@ Geom <- ggproto("Geom",
     # Take care of subclasses setting the wrong default when inheriting from
     # a geom with rename_size = TRUE
     if (self$rename_size && is.null(default_aes$linewidth)) {
-      deprecate_soft0("3.4.0", I("Using the `size` aesthetic in this geom"), I("`linewidth` in the `default_aes` field and elsewhere"))
+      deprecate_warn0("3.4.0", I("Using the `size` aesthetic in this geom"), I("`linewidth` in the `default_aes` field and elsewhere"))
       default_aes$linewidth <- default_aes$size
     }
 
@@ -281,7 +281,7 @@ check_aesthetics <- function(x, n) {
 
 fix_linewidth <- function(data, name) {
   if (is.null(data$linewidth) && !is.null(data$size)) {
-    deprecate_soft0("3.4.0", I(paste0("Using the `size` aesthetic with ", name)), I("the `linewidth` aesthetic"))
+    deprecate_warn0("3.4.0", I(paste0("Using the `size` aesthetic with ", name)), I("the `linewidth` aesthetic"))
     data$linewidth <- data$size
   }
   data

R/geom-spoke.R

@@ -47,8 +47,7 @@ geom_spoke <- function(mapping = NULL, data = NULL,
 #' @rdname geom_spoke
 #' @usage NULL
 stat_spoke <- function(...) {
-  deprecate_warn0("2.0.0", "stat_spoke()", "geom_spoke()")
-  geom_spoke(...)
+  lifecycle::deprecate_stop("2.0.0", "stat_spoke()", "geom_spoke()")
 }
 
 #' @rdname ggplot2-ggproto

R/labeller.R

@@ -411,7 +411,7 @@ labeller <- function(..., .rows = NULL, .cols = NULL,
                      keep.as.numeric = deprecated(), .multi_line = TRUE,
                      .default = label_value) {
   if (lifecycle::is_present(keep.as.numeric)) {
-    deprecate_warn0("2.0.0", "labeller(keep.as.numeric)")
+    lifecycle::deprecate_stop("2.0.0", "labeller(keep.as.numeric)")
   }
   dots <- list2(...)
   .default <- as_labeller(.default)
@@ -577,22 +577,18 @@ assemble_strips <- function(grobs, theme, horizontal = TRUE, clip) {
   })
 }
 
-# Repair old school labeller
-fix_labeller <- function(labeller) {
+# Reject old school labeller
+check_labeller <- function(labeller) {
+
   labeller <- match.fun(labeller)
   is_deprecated <- all(c("variable", "value") %in% names(formals(labeller)))
 
-  if (is_deprecated) {
-    deprecate_warn0(
-      "2.0.0", what = "facet_(labeller)",
-      details =
-      "Modern labellers do not take `variable` and `value` arguments anymore."
-    )
-    old_labeller <- labeller
-    labeller <- function(labels) {
-      Map(old_labeller, names(labels), labels)
-    }
+  if (!is_deprecated) {
+    return(invisible())
   }
 
-  labeller
+  lifecycle::deprecate_stop(
+    "2.0.0",
+    what = I("Providing a labeller with `variable` and `value` arguments")
+  )
 }

R/layer.R

@@ -104,9 +104,9 @@ layer <- function(geom = NULL, stat = NULL,
 
   # Handle show_guide/show.legend
   if (!is.null(params$show_guide)) {
-    deprecate_warn0("2.0.0", "layer(show_guide)", "layer(show.legend)", user_env = user_env)
-    show.legend <- params$show_guide
-    params$show_guide <- NULL
+    lifecycle::deprecate_stop(
+      "2.0.0", "layer(show_guide)", "layer(show.legend)"
+    )
   }
 
   # we validate mapping before data because in geoms and stats
@@ -156,7 +156,7 @@ layer <- function(geom = NULL, stat = NULL,
   if (geom$rename_size && "size" %in% extra_param && !"linewidth" %in% mapped_aesthetics(mapping)) {
     aes_params <- c(aes_params, params["size"])
     extra_param <- setdiff(extra_param, "size")
-    deprecate_soft0("3.4.0", I("Using `size` aesthetic for lines"), I("`linewidth`"), user_env = user_env)
+    deprecate_warn0("3.4.0", I("Using `size` aesthetic for lines"), I("`linewidth`"), user_env = user_env)
   }
   if (check.param && length(extra_param) > 0) {
     cli::cli_warn("Ignoring unknown parameters: {.arg {extra_param}}", call = call_env)
@@ -169,7 +169,7 @@ layer <- function(geom = NULL, stat = NULL,
   # Take care of size->linewidth aes renaming
   if (geom$rename_size && "size" %in% extra_aes && !"linewidth" %in% mapped_aesthetics(mapping)) {
     extra_aes <- setdiff(extra_aes, "size")
-    deprecate_soft0("3.4.0", I("Using `size` aesthetic for lines"), I("`linewidth`"), user_env = user_env)
+    deprecate_warn0("3.4.0", I("Using `size` aesthetic for lines"), I("`linewidth`"), user_env = user_env)
   }
   if (check.aes && length(extra_aes) > 0) {
     cli::cli_warn("Ignoring unknown aesthetics: {.field {extra_aes}}", call = call_env)
@@ -273,7 +273,7 @@ Layer <- ggproto("Layer", NULL,
           !"linewidth" %in% names(self$computed_mapping) &&
           "linewidth" %in% self$geom$aesthetics()) {
         self$computed_mapping$size <- plot$mapping$size
-        deprecate_soft0("3.4.0", I("Using `size` aesthetic for lines"), I("`linewidth`"))
+        deprecate_warn0("3.4.0", I("Using `size` aesthetic for lines"), I("`linewidth`"))
       }
       # defaults() strips class, but it needs to be preserved for now
       class(self$computed_mapping) <- "uneval"

R/plot.R

@@ -178,18 +178,17 @@ plot_clone <- function(plot) {
 #' @export
 #' @method print ggplot
 #' @examples
-#' colours <- list(~class, ~drv, ~fl)
+#' colours <- c("class", "drv", "fl")
 #'
 #' # Doesn't seem to do anything!
 #' for (colour in colours) {
-#'   ggplot(mpg, aes_(~ displ, ~ hwy, colour = colour)) +
+#'   ggplot(mpg, aes(displ, hwy, colour = .data[[colour]])) +
 #'     geom_point()
 #' }
 #'
-#' # Works when we explicitly print the plots
 #' for (colour in colours) {
-#'   print(ggplot(mpg, aes_(~ displ, ~ hwy, colour = colour)) +
-#'     geom_point())
+#'   print(ggplot(mpg, aes(displ, hwy, colour = .data[[colour]])) +
+#'           geom_point())
 #' }
 print.ggplot <- function(x, newpage = is.null(vp), vp = NULL, ...) {
   set_last_plot(x)

R/quick-plot.R

@@ -62,7 +62,7 @@ qplot <- function(x, y, ..., data, facets = NULL, margins = FALSE,
                   xlab = NULL, ylab = NULL,
                   asp = NA, stat = deprecated(), position = deprecated()) {
 
-  deprecate_soft0("3.4.0", "qplot()")
+  deprecate_warn0("3.4.0", "qplot()")
 
   caller_env <- parent.frame()
 

R/theme-elements.R

@@ -94,7 +94,7 @@ element_rect <- function(fill = NULL, colour = NULL, linewidth = NULL,
   linetype = NULL, color = NULL, inherit.blank = FALSE, size = deprecated()) {
 
   if (lifecycle::is_present(size)) {
-    deprecate_soft0("3.4.0", "element_rect(size)", "element_rect(linewidth)")
+    deprecate_warn0("3.4.0", "element_rect(size)", "element_rect(linewidth)")
     linewidth <- size
   }
 
@@ -115,7 +115,7 @@ element_line <- function(colour = NULL, linewidth = NULL, linetype = NULL,
   inherit.blank = FALSE, size = deprecated()) {
 
   if (lifecycle::is_present(size)) {
-    deprecate_soft0("3.4.0", "element_line(size)", "element_line(linewidth)")
+    deprecate_warn0("3.4.0", "element_line(size)", "element_line(linewidth)")
     linewidth <- size
   }
 
@@ -307,7 +307,7 @@ element_grob.element_rect <- function(element, x = 0.5, y = 0.5,
   fill = NULL, colour = NULL, linewidth = NULL, linetype = NULL, ..., size = deprecated()) {
 
   if (lifecycle::is_present(size)) {
-    deprecate_soft0("3.4.0", "element_grob.element_rect(size)", "element_grob.element_rect(linewidth)")
+    deprecate_warn0("3.4.0", "element_grob.element_rect(size)", "element_grob.element_rect(linewidth)")
     linewidth <- size
   }
 
@@ -357,7 +357,7 @@ element_grob.element_line <- function(element, x = 0:1, y = 0:1,
   default.units = "npc", id.lengths = NULL, ..., size = deprecated()) {
 
   if (lifecycle::is_present(size)) {
-    deprecate_soft0("3.4.0", "element_grob.element_line(size)", "element_grob.element_line(linewidth)")
+    deprecate_warn0("3.4.0", "element_grob.element_line(size)", "element_grob.element_line(linewidth)")
     linewidth <- size
   }
 

R/theme.R

@@ -469,34 +469,6 @@ theme <- function(...,
                   validate = TRUE) {
   elements <- find_args(..., complete = NULL, validate = NULL)
 
-  if (!is.null(elements$axis.ticks.margin)) {
-    deprecate_warn0(
-      "2.0.0", "theme(axis.ticks.margin)",
-      details = "Please set `margin` property of `axis.text` instead"
-    )
-    elements$axis.ticks.margin <- NULL
-  }
-  if (!is.null(elements$panel.margin)) {
-    deprecate_warn0(
-      "2.2.0", "theme(panel.margin)", "theme(panel.spacing)"
-    )
-    elements$panel.spacing <- elements$panel.margin
-    elements$panel.margin <- NULL
-  }
-  if (!is.null(elements$panel.margin.x)) {
-    deprecate_warn0(
-      "2.2.0", "theme(panel.margin.x)", "theme(panel.spacing.x)"
-    )
-    elements$panel.spacing.x <- elements$panel.margin.x
-    elements$panel.margin.x <- NULL
-  }
-  if (!is.null(elements$panel.margin.y)) {
-    deprecate_warn0(
-      "2.2.0", "theme(panel.margin.y)", "theme(panel.spacing.y)"
-    )
-    elements$panel.spacing.y <- elements$panel.margin.y
-    elements$panel.margin.y <- NULL
-  }
   if (is.unit(elements$legend.margin) && !is.margin(elements$legend.margin)) {
     cli::cli_warn(c(
       "{.var legend.margin} must be specified using {.fn margin}",