Bump deprecations

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.2.0 now 
+  throw warnings.
 * Fixed bug where the `ggplot2::`-prefix did not work with `stage()` 
   (@teunbrand, #6104).
 * New `get_labs()` function for retrieving completed plot labels 

R/aes.R

@@ -283,7 +283,7 @@
 #'
 #' @export
 aes_ <- function(x, y, ...) {
-  deprecate_soft0(
+  deprecate_warn0(
     "3.0.0",
     "aes_()",
     details = "Please use tidy evaluation idioms with `aes()`"
@@ -310,7 +310,7 @@
 #' @rdname aes_
 #' @export
 aes_string <- function(x, y, ...) {
-  deprecate_soft0(
+  deprecate_warn0(
     "3.0.0",
     "aes_string()",
     details = c(
@@ -367,29 +367,7 @@
 #' @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

@@ -89,7 +89,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/facet-grid-.R

@@ -132,10 +132,9 @@
                        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

R/facet-wrap.R

@@ -180,8 +180,9 @@
   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

@@ -133,6 +133,6 @@
 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-spoke.R

@@ -47,8 +47,7 @@
 #' @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 @@
                      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)

R/layer.R

@@ -110,9 +110,9 @@
 
   # 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

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/stat-bin.R

@@ -109,18 +109,13 @@ StatBin <- ggproto("StatBin", Stat,
     }
 
     if (!is.null(params$drop)) {
-      deprecate_warn0("2.1.0", "stat_bin(drop)", "stat_bin(pad)")
-      params$drop <- NULL
+      lifecycle::deprecate_stop("2.1.0", "stat_bin(drop)", "stat_bin(pad)")
     }
     if (!is.null(params$origin)) {
-      deprecate_warn0("2.1.0", "stat_bin(origin)", "stat_bin(boundary)")
-      params$boundary <- params$origin
-      params$origin <- NULL
+      lifecycle::deprecate_stop("2.1.0", "stat_bin(origin)", "stat_bin(boundary)")
     }
     if (!is.null(params$right)) {
-      deprecate_warn0("2.1.0", "stat_bin(right)", "stat_bin(closed)")
-      params$closed <- if (params$right) "right" else "left"
-      params$right <- NULL
+      lifecycle::deprecate_stop("2.1.0", "stat_bin(right)", "stat_bin(closed)")
     }
     if (!is.null(params$boundary) && !is.null(params$center)) {
       cli::cli_abort("Only one of {.arg boundary} and {.arg center} may be specified in {.fn {snake_class(self)}}.")

R/theme.R

@@ -456,32 +456,25 @@
   elements <- find_args(..., complete = NULL, validate = NULL)
 
   if (!is.null(elements$axis.ticks.margin)) {
-    deprecate_warn0(
+    lifecycle::deprecate_stop(
       "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(
+    lifecycle::deprecate_stop(
       "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(
+    lifecycle::deprecate_stop(
       "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(
+    lifecycle::deprecate_stop(
       "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(