replace soft deprecations

teunbrand · teunbrand · commit 55c6acce4352 · 2025-11-05T17:30:08.000+01:00
diff --git a/R/annotation-borders.R b/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(...)
 }
diff --git a/R/annotation-logticks.R b/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
   }
 
diff --git a/R/axis-secondary.R b/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
   }
 
diff --git a/R/coord-.R b/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)
 }
 
diff --git a/R/coord-transform.R b/R/coord-transform.R
@@ -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()"
diff --git a/R/facet-.R b/R/facet-.R
@@ -939,7 +939,7 @@ is_facet <- function(x) inherits(x, "Facet")
 #' @rdname is_tests
 #' @usage is.facet(x) # Deprecated
 is.facet <- function(x) {
-  deprecate_soft0("3.5.2", "is.facet()", "is_facet()")
+  deprecate("3.5.2", "is.facet()", "is_facet()")
   is_facet(x)
 }
 
diff --git a/R/facet-wrap.R b/R/facet-wrap.R
@@ -568,7 +568,7 @@ wrap_layout <- function(id, dims, dir) {
   if (nchar(dir) != 2) {
     # Should only occur when `as.table` was not incorporated into `dir`
     dir <- switch(dir, h = "lt", v = "tl")
-    deprecate_soft0(
+    deprecate(
       "4.0.0",
       what = I("Internal use of `dir = \"h\"` and `dir = \"v\"` in `facet_wrap()`"),
       details = I(c(
diff --git a/R/geom-boxplot.R b/R/geom-boxplot.R
@@ -240,7 +240,7 @@ GeomBoxplot <- ggproto("GeomBoxplot", Geom,
 
   setup_params = function(data, params) {
     if ("fatten" %in% names(params)) {
-      deprecate_soft0(
+      deprecate(
         "4.0.0", "geom_boxplot(fatten)",
         "geom_boxplot(median.linewidth)"
       )
diff --git a/R/geom-crossbar.R b/R/geom-crossbar.R
@@ -61,7 +61,7 @@ geom_crossbar <- function(mapping = NULL, data = NULL,
 GeomCrossbar <- ggproto("GeomCrossbar", Geom,
   setup_params = function(data, params) {
     if (lifecycle::is_present(params$fatten %||% deprecated())) {
-      deprecate_soft0(
+      deprecate(
         "4.0.0", "geom_crossbar(fatten)",
         "geom_crossbar(middle.linewidth)"
       )
diff --git a/R/geom-errorbar.R b/R/geom-errorbar.R
@@ -77,7 +77,7 @@ GeomErrorbar <- ggproto(
 GeomErrorbarh <- ggproto(
   "GeomErrorbarh", GeomErrorbar,
   setup_params = function(data, params) {
-    deprecate_soft0(
+    deprecate(
       "4.0.0", "geom_errorbarh()", "geom_errorbar(orientation = \"y\")",
       id = "no-more-errorbarh"
     )
@@ -95,7 +95,7 @@ geom_errorbar <- make_constructor(GeomErrorbar, orientation = NA)
 #' `geom_errorbarh()` is `r lifecycle::badge("deprecated")`. Use
 #' `geom_errorbar(orientation = "y")` instead.
 geom_errorbarh <- function(..., orientation = "y") {
-  deprecate_soft0(
+  deprecate(
     "4.0.0", "geom_errorbarh()", "geom_errorbar(orientation = \"y\")",
     id = "no-more-errorbarh"
   )
diff --git a/R/geom-label.R b/R/geom-label.R
@@ -28,7 +28,7 @@ geom_label <- function(mapping = NULL, data = NULL,
 
   extra_args <- list2(...)
   if (lifecycle::is_present(label.size)) {
-    deprecate_soft0("3.5.0", "geom_label(label.size)", "geom_label(linewidth)")
+    deprecate("3.5.0", "geom_label(label.size)", "geom_label(linewidth)")
     extra_args$linewidth <- extra_args$linewidth %||% label.size
   }
 
diff --git a/R/geom-pointrange.R b/R/geom-pointrange.R
@@ -16,7 +16,7 @@ GeomPointrange <- ggproto("GeomPointrange", Geom,
 
   setup_params = function(data, params) {
     if (lifecycle::is_present(params$fatten %||% deprecated())) {
-      deprecate_soft0("4.0.0", "geom_pointrange(fatten)", I("the `size` aesthetic"))
+      deprecate("4.0.0", "geom_pointrange(fatten)", I("the `size` aesthetic"))
     } else {
       # For backward compatibility reasons
       params$fatten <- 4
diff --git a/R/geom-violin.R b/R/geom-violin.R
@@ -111,7 +111,7 @@ geom_violin <- function(mapping = NULL, data = NULL,
 
   extra <- list()
   if (lifecycle::is_present(draw_quantiles)) {
-    deprecate_soft0(
+    deprecate(
       "4.0.0",
       what = "geom_violin(draw_quantiles)",
       with = "geom_violin(quantiles.linetype)"
diff --git a/R/ggproto.R b/R/ggproto.R
@@ -113,7 +113,7 @@ is_ggproto <- function(x) inherits(x, "ggproto")
 #' @rdname is_tests
 #' @usage is.ggproto(x) # Deprecated
 is.ggproto <- function(x) {
-  deprecate_soft0("3.5.2", "is.ggproto()", "is_ggproto()")
+  deprecate("3.5.2", "is.ggproto()", "is_ggproto()")
   is_ggproto(x)
 }
 
diff --git a/R/guide-colorbar.R b/R/guide-colorbar.R
@@ -139,7 +139,7 @@ guide_colourbar <- function(
   ...
 ) {
   if (lifecycle::is_present(raster)) {
-    deprecate_soft0("3.5.0", "guide_colourbar(raster)", "guide_colourbar(display)")
+    deprecate("3.5.0", "guide_colourbar(raster)", "guide_colourbar(display)")
     check_bool(raster)
     display <- if (raster) "raster" else "rectangles"
   }
diff --git a/R/guide-legend.R b/R/guide-legend.R
@@ -734,7 +734,7 @@ deprecated_guide_args <- function(
   fun_name <- call_name(.call)
   replacement <- paste0(fun_name, "(theme)")
   for (arg_name in names(vals)) {
-    deprecate_soft0(
+    deprecate(
       when = "3.5.0",
       what = paste0(fun_name, "(", arg_name, ")"),
       with = replacement
diff --git a/R/guide-old.R b/R/guide-old.R
@@ -65,7 +65,7 @@ guide_gengrob.default <- guide_train.default
 #' @export
 #' @rdname old_guide
 old_guide <- function(guide) {
-  deprecate_soft0(
+  deprecate(
     when = "3.5.0",
     what = I("The S3 guide system"),
     details = c(
diff --git a/R/plot-construction.R b/R/plot-construction.R
@@ -81,7 +81,7 @@ S7::method(`+`, list(class_theme, S7::class_any)) <- function(e1, e2) {
 #' @export
 "%+%" <- function(e1, e2) {
   if (getRversion() >= "4.3.0") {
-    deprecate_soft0("4.0.0", I("<ggplot> %+% x"), I("<ggplot> + x"))
+    deprecate("4.0.0", I("<ggplot> %+% x"), I("<ggplot> + x"))
   }
   add_gg(e1, e2)
 }
diff --git a/R/plot.R b/R/plot.R
@@ -162,7 +162,7 @@ is_ggplot <- function(x) S7::S7_inherits(x, class_ggplot)
 #' @rdname is_tests
 #' @usage is.ggplot(x) # Deprecated
 is.ggplot <- function(x) {
-  deprecate_soft0("3.5.2", "is.ggplot()", "is_ggplot()")
+  deprecate("3.5.2", "is.ggplot()", "is_ggplot()")
   is_ggplot(x)
 }
 
diff --git a/R/scale-.R b/R/scale-.R
@@ -114,10 +114,10 @@ continuous_scale <- function(aesthetics, scale_name = deprecated(), palette, nam
                              super = ScaleContinuous) {
   call <- call %||% current_call()
   if (lifecycle::is_present(scale_name)) {
-    deprecate_soft0("3.5.0", "continuous_scale(scale_name)")
+    deprecate("3.5.0", "continuous_scale(scale_name)")
   }
   if (lifecycle::is_present(trans)) {
-    deprecate_soft0("3.5.0", "continuous_scale(trans)", "continuous_scale(transform)")
+    deprecate("3.5.0", "continuous_scale(trans)", "continuous_scale(transform)")
     transform <- trans
   }
 
@@ -224,7 +224,7 @@ discrete_scale <- function(aesthetics, scale_name = deprecated(), palette, name
                            super = ScaleDiscrete) {
   call <- call %||% current_call()
   if (lifecycle::is_present(scale_name)) {
-    deprecate_soft0("3.5.0", "discrete_scale(scale_name)")
+    deprecate("3.5.0", "discrete_scale(scale_name)")
   }
 
   aesthetics <- standardise_aes_names(aesthetics)
@@ -321,10 +321,10 @@ binned_scale <- function(aesthetics, scale_name = deprecated(), palette, name =
                          call = caller_call(),
                          super = ScaleBinned) {
   if (lifecycle::is_present(scale_name)) {
-    deprecate_soft0("3.5.0", "binned_scale(scale_name)")
+    deprecate("3.5.0", "binned_scale(scale_name)")
   }
   if (lifecycle::is_present(trans)) {
-    deprecate_soft0("3.5.0", "binned_scale(trans)", "binned_scale(transform)")
+    deprecate("3.5.0", "binned_scale(trans)", "binned_scale(transform)")
     transform <- trans
   }
 
diff --git a/R/stat-ydensity.R b/R/stat-ydensity.R
@@ -11,7 +11,7 @@ StatYdensity <- ggproto(
     params$flipped_aes <- has_flipped_aes(data, params, main_is_orthogonal = TRUE, group_has_equal = TRUE)
 
     if (!is.null(params$draw_quantiles)) {
-      deprecate_soft0(
+      deprecate(
         "4.0.0",
         what = "stat_ydensity(draw_quantiles)",
         with = "stat_ydensity(quantiles)"
diff --git a/R/theme-elements.R b/R/theme-elements.R
@@ -397,37 +397,37 @@ rel <- function(x) {
 # Element getter methods
 local({
   S7::method(`$`, element) <- function(x, i) {
-    # deprecate_soft0("4.1.0", I("`<ggplot2::element>$i`"), I("`<ggplot2::element>@i`"))
+    deprecate("4.1.0", I("`<ggplot2::element>$i`"), I("`<ggplot2::element>@i`"))
     `[[`(S7::props(x), i)
   }
   S7::method(`[`, element) <- function(x, i) {
-    # deprecate_soft0("4.1.0", I("`<gglot2::element>[i]`"), I("`S7::props(<ggplot2::element>, i)`"))
+    deprecate("4.1.0", I("`<gglot2::element>[i]`"), I("`S7::props(<ggplot2::element>, i)`"))
     `[`(S7::props(x), i)
   }
   S7::method(`[[`, element) <- function(x, i) {
-    # deprecate_soft0("4.1.0", I("`<ggplot2::element>[[i]]`"), I("`S7::prop(<ggplot2::element>, i)`"))
+    deprecate("4.1.0", I("`<ggplot2::element>[[i]]`"), I("`S7::prop(<ggplot2::element>, i)`"))
     `[[`(S7::props(x), i)
   }
 })
 
 # Element setter methods
 #' @export
 `$<-.ggplot2::element` <- function(x, i, value) {
-  # deprecate_soft0("4.1.0", I("`<ggplot2::element>$i <- value`"), I("`<ggplot2::element>@i <- value`"))
+  deprecate("4.1.0", I("`<ggplot2::element>$i <- value`"), I("`<ggplot2::element>@i <- value`"))
   S7::props(x) <- `[[<-`(S7::props(x), i, value)
   x
 }
 
 #' @export
 `[<-.ggplot2::element` <- function(x, i, value) {
-  # deprecate_soft0("4.1.0", I("`<ggplot2::element>[i] <- value`"), I("`S7::props(<ggplot2::element>)[i] <- value`"))
+  deprecate("4.1.0", I("`<ggplot2::element>[i] <- value`"), I("`S7::props(<ggplot2::element>)[i] <- value`"))
   S7::props(x) <- `[<-`(S7::props(x), i, value)
   x
 }
 
 #' @export
 `[[<-.ggplot2::element` <- function(x, i, value) {
-  # deprecate_soft0("4.1.0", I("`<ggplot2::element>[[i]] <- value`"), I("S7::prop(<ggplot2::element>, i) <- value"))
+  deprecate("4.1.0", I("`<ggplot2::element>[[i]] <- value`"), I("S7::prop(<ggplot2::element>, i) <- value"))
   S7::props(x) <- `[[<-`(S7::props(x), i, value)
   x
 }
diff --git a/R/theme.R b/R/theme.R
@@ -515,7 +515,7 @@ fix_theme_deprecations <- function(elements) {
     elements$legend.margin <- margin()
   }
   if (!is.null(elements$legend.title.align)) {
-    deprecate_soft0(
+    deprecate(
       "3.5.0", "theme(legend.title.align)",
       I("theme(legend.title = element_text(hjust))")
     )
@@ -528,7 +528,7 @@ fix_theme_deprecations <- function(elements) {
     elements$legend.title.align <- NULL
   }
   if (!is.null(elements$legend.text.align)) {
-    deprecate_soft0(
+    deprecate(
       "3.5.0", "theme(legend.text.align)",
       I("theme(legend.text = element_text(hjust))")
     )
@@ -541,7 +541,7 @@ fix_theme_deprecations <- function(elements) {
     elements$legend.text.align <- NULL
   }
   if (is.numeric(elements[["legend.position"]])) {
-    deprecate_soft0(
+    deprecate(
       "3.5.0", I("A numeric `legend.position` argument in `theme()`"),
       "theme(legend.position.inside)"
     )
@@ -599,7 +599,7 @@ is_theme <- function(x) S7::S7_inherits(x, class_theme)
 #' @rdname is_tests
 #' @usage is.theme(x) # Deprecated
 is.theme <- function(x) {
-  deprecate_soft0("3.5.2", "is.theme()", "is_theme()")
+  deprecate("3.5.2", "is.theme()", "is_theme()")
   is_theme(x)
 }
 
diff --git a/R/utilities.R b/R/utilities.R
@@ -716,7 +716,7 @@ with_ordered_restart <- function(expr, .call) {
         ")"
       )
 
-      deprecate_soft0(
+      deprecate(
         "3.4.0",
         I(msg),
         details = desc
@@ -804,11 +804,6 @@ deprecate <- function(when, ..., id = NULL, always = FALSE, user_env = NULL,
   invisible()
 }
 
-deprecate_soft0 <- function(..., user_env = NULL) {
-  user_env <- user_env %||% getOption("ggplot2_plot_env") %||% caller_env(2)
-  lifecycle::deprecate_soft(..., user_env = user_env)
-}
-
 deprecate_warn0 <- function(..., user_env = NULL) {
   user_env <- user_env %||% getOption("ggplot2_plot_env") %||% caller_env(2)
   lifecycle::deprecate_warn(..., user_env = user_env)

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ annotation_borders <- function(database = "world", regions = ".", fill = NA,`
`46`	`46`	`#' @rdname annotation_borders`
`47`	`47`	`#' @usage borders(...) # Deprecated`
`48`	`48`	`borders <- function(...) {`
`49`		`- deprecate_soft0("4.0.0", "borders()", "annotation_borders()")`
	`49`	`+ deprecate("4.0.0", "borders()", "annotation_borders()")`
`50`	`50`	`annotation_borders(...)`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ annotation_logticks <- function(base = 10, sides = "bl", outside = FALSE, scaled`
`96`	`96`	`lifecycle::signal_stage("superseded", "annotation_logticks()", "guide_axis_logticks()")`
`97`	`97`
`98`	`98`	`if (lifecycle::is_present(size)) {`
`99`		- deprecate_soft0("3.5.0", I("Using the `size` aesthetic in this geom"), I("`linewidth`"))
	`99`	+ deprecate("3.5.0", I("Using the `size` aesthetic in this geom"), I("`linewidth`"))
`100`	`100`	`linewidth <- linewidth %\|\|% size`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ sec_axis <- function(transform = NULL,`
`100`	`100`	`name = waiver(), breaks = waiver(), labels = waiver(),`
`101`	`101`	`guide = waiver(), trans = deprecated()) {`
`102`	`102`	`if (lifecycle::is_present(trans)) {`
`103`		`- deprecate_soft0("3.5.0", "sec_axis(trans)", "sec_axis(transform)")`
	`103`	`+ deprecate("3.5.0", "sec_axis(trans)", "sec_axis(transform)")`
`104`	`104`	`transform <- trans`
`105`	`105`	`}`
`106`	`106`
Original file line number	Diff line number	Diff line change
`@@ -696,7 +696,7 @@ is_coord <- function(x) inherits(x, "Coord")`
`696`	`696`	`#' @rdname is_tests`
`697`	`697`	`#' @usage is.Coord(x) # Deprecated`
`698`	`698`	`is.Coord <- function(x) {`
`699`		`- deprecate_soft0("3.5.2", "is.Coord()", "is_coord()")`
	`699`	`+ deprecate("3.5.2", "is.Coord()", "is_coord()")`
`700`	`700`	`is_coord(x)`
`701`	`701`	`}`
`702`	`702`
Original file line number	Diff line number	Diff line change
`@@ -939,7 +939,7 @@ is_facet <- function(x) inherits(x, "Facet")`
`939`	`939`	`#' @rdname is_tests`
`940`	`940`	`#' @usage is.facet(x) # Deprecated`
`941`	`941`	`is.facet <- function(x) {`
`942`		`- deprecate_soft0("3.5.2", "is.facet()", "is_facet()")`
	`942`	`+ deprecate("3.5.2", "is.facet()", "is_facet()")`
`943`	`943`	`is_facet(x)`
`944`	`944`	`}`
`945`	`945`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ GeomBoxplot <- ggproto("GeomBoxplot", Geom,`
`240`	`240`
`241`	`241`	`setup_params = function(data, params) {`
`242`	`242`	`if ("fatten" %in% names(params)) {`
`243`		`- deprecate_soft0(`
	`243`	`+ deprecate(`
`244`	`244`	`"4.0.0", "geom_boxplot(fatten)",`
`245`	`245`	`"geom_boxplot(median.linewidth)"`
`246`	`246`	`)`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ geom_crossbar <- function(mapping = NULL, data = NULL,`
`61`	`61`	`GeomCrossbar <- ggproto("GeomCrossbar", Geom,`
`62`	`62`	`setup_params = function(data, params) {`
`63`	`63`	`if (lifecycle::is_present(params$fatten %\|\|% deprecated())) {`
`64`		`- deprecate_soft0(`
	`64`	`+ deprecate(`
`65`	`65`	`"4.0.0", "geom_crossbar(fatten)",`
`66`	`66`	`"geom_crossbar(middle.linewidth)"`
`67`	`67`	`)`