Synchronise lifecycle management (#6733)

* utility to manage lifecycles

* replace soft deprecations

* add option to bump severity

* replace `deprecate_warn`

* prefix utils

* add de-escalation option

* replace `deprecate_stop()` as well

Author: teunbrand

R/aes-delayed-eval.R

@@ -257,7 +257,7 @@ is_calculated <- function(x, warn = FALSE) {
       what <- I(paste0("The dot-dot notation (`", x, "`)"))
       var <- gsub(match_calculated_aes, "\\1", as.character(x))
       with <- I(paste0("`after_stat(", var, ")`"))
-      deprecate_warn0("3.4.0", what, with, id = "ggplot-warn-aes-dot-dot")
+      deprecate("3.4.0", what, with, id = "ggplot-warn-aes-dot-dot")
     }
     res
   } else if (is_quosure(x)) {
@@ -268,7 +268,7 @@ is_calculated <- function(x, warn = FALSE) {
         what <- I(paste0("`", expr_deparse(x), "`"))
         x[[1]] <- quote(after_stat)
         with <- I(paste0("`", expr_deparse(x), "`"))
-        deprecate_warn0("3.4.0", what, with, id = "ggplot-warn-aes-stat")
+        deprecate("3.4.0", what, with, id = "ggplot-warn-aes-stat")
       }
       TRUE
     } else {

R/aes-variants.R

@@ -44,7 +44,7 @@
 #'
 #' @export
 aes_ <- function(x, y, ...) {
-  deprecate_warn0(
+  deprecate(
     "3.0.0",
     "aes_()",
     details = "Please use tidy evaluation idioms with `aes()`"
@@ -71,7 +71,7 @@ aes_ <- function(x, y, ...) {
 #' @rdname aes_
 #' @export
 aes_string <- function(x, y, ...) {
-  deprecate_warn0(
+  deprecate(
     "3.0.0",
     "aes_string()",
     details = c(
@@ -127,6 +127,6 @@ aes_all <- function(vars) {
 #' @keywords internal
 #' @export
 aes_auto <- function(data = NULL, ...) {
-  lifecycle::deprecate_stop("2.0.0", "aes_auto()")
+  deprecate("2.0.0", "aes_auto()")
 }
 

R/aes.R

@@ -246,7 +246,6 @@ mapped_aesthetics <- function(x) {
   names(x)[!is_null]
 }
 
-
 #' Check a mapping for discouraged usage
 #'
 #' Checks that `$` and `[[` are not used when the target *is* the data

R/annotation-borders.R

@@ -46,6 +46,6 @@ annotation_borders <- function(database = "world", regions = ".", fill = NA,
 #' @rdname annotation_borders
 #' @usage borders(...) # Deprecated
 borders <- function(...) {
-  deprecate_soft0("4.0.0", "borders()", "annotation_borders()")
+  deprecate("4.0.0", "borders()", "annotation_borders()")
   annotation_borders(...)
 }

R/annotation-logticks.R

@@ -96,7 +96,7 @@ annotation_logticks <- function(base = 10, sides = "bl", outside = FALSE, scaled
   lifecycle::signal_stage("superseded", "annotation_logticks()", "guide_axis_logticks()")
 
   if (lifecycle::is_present(size)) {
-    deprecate_soft0("3.5.0", I("Using the `size` aesthetic in this geom"), I("`linewidth`"))
+    deprecate("3.5.0", I("Using the `size` aesthetic in this geom"), I("`linewidth`"))
     linewidth <- linewidth %||% size
   }
 

R/axis-secondary.R

@@ -100,7 +100,7 @@ sec_axis <- function(transform = NULL,
                      name = waiver(), breaks = waiver(), labels = waiver(),
                      guide = waiver(), trans = deprecated()) {
   if (lifecycle::is_present(trans)) {
-    deprecate_soft0("3.5.0", "sec_axis(trans)", "sec_axis(transform)")
+    deprecate("3.5.0", "sec_axis(trans)", "sec_axis(transform)")
     transform <- trans
   }
 

R/bin.R

@@ -247,12 +247,6 @@ bin_loc <- function(x, id) {
 
 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(version, args[1], args[2])

R/coord-.R

@@ -696,7 +696,7 @@ is_coord <- function(x) inherits(x, "Coord")
 #' @rdname is_tests
 #' @usage is.Coord(x) # Deprecated
 is.Coord <- function(x) {
-  deprecate_soft0("3.5.2", "is.Coord()", "is_coord()")
+  deprecate("3.5.2", "is.Coord()", "is_coord()")
   is_coord(x)
 }
 

R/coord-radial.R

@@ -123,20 +123,23 @@ coord_radial <- function(theta = "x",
                          rotate_angle = deprecated()) {
 
   if (lifecycle::is_present(r_axis_inside)) {
-    deprecate_warn0(
-      "3.5.1", "coord_radial(r_axis_inside)", "coord_radial(r.axis.inside)"
+    deprecate(
+      "coord_radial(r_axis_inside)", "coord_radial(r.axis.inside)",
+      when = "3.5.1", escalate = "warn"
     )
     r.axis.inside <- r_axis_inside
   }
   if (lifecycle::is_present(rotate_angle)) {
-    deprecate_warn0(
-      "3.5.1", "coord_radial(rotate_angle)", "coord_radial(rotate.angle)"
+    deprecate(
+      "coord_radial(rotate_angle)", "coord_radial(rotate.angle)",
+      when = "3.5.1", escalate = "warn"
     )
     rotate.angle <- rotate_angle
   }
   if (lifecycle::is_present(direction)) {
-    deprecate_warn0(
-      "4.0.0", "coord_radial(direction)", "coord_radial(reverse)"
+    deprecate(
+      "4.0.0", "coord_radial(direction)", "coord_radial(reverse)",
+      when = "4.0.0", escalate = "warn"
     )
     reverse <- switch(reverse, "r" = "thetar", "theta")
   }

R/coord-transform.R

@@ -84,11 +84,11 @@ coord_transform <- function(x = "identity", y = "identity", xlim = NULL, ylim =
                             limx = deprecated(), limy = deprecated(), clip = "on",
                             expand = TRUE, reverse = "none") {
   if (lifecycle::is_present(limx)) {
-    deprecate_warn0("3.3.0", "coord_transform(limx)", "coord_transform(xlim)")
+    deprecate("3.3.0", "coord_transform(limx)", "coord_transform(xlim)")
     xlim <- limx
   }
   if (lifecycle::is_present(limy)) {
-    deprecate_warn0("3.3.0", "coord_transform(limy)", "coord_transform(ylim)")
+    deprecate("3.3.0", "coord_transform(limy)", "coord_transform(ylim)")
     ylim <- limy
   }
 
@@ -112,7 +112,7 @@ coord_transform <- function(x = "identity", y = "identity", xlim = NULL, ylim =
 #' @rdname coord_transform
 #' @export
 coord_trans <- function(...) {
-  deprecate_soft0(
+  deprecate(
     "4.0.0",
     "coord_trans()",
     "coord_transform()"