Turn fix_labeller() into a check function

Author: teunbrand

R/facet-grid-.R

@@ -176,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,7 +174,7 @@ 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)

R/labeller.R

@@ -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")
+  )
 }

tests/testthat/_snaps/facet-labels.md

@@ -14,8 +14,3 @@
       Error in `labeller()`:
       ! Conflict between `.cols` and `cyl`.
 
-# old school labellers still work
-
-    The `labeller` argument of `facet_()` is deprecated as of ggplot2 2.0.0.
-    i Modern labellers do not take `variable` and `value` arguments anymore.
-

tests/testthat/test-facet-labels.R

@@ -130,18 +130,12 @@ test_that("as_labeller() deals with non-labellers", {
   expect_equal(get_labels_matrix(p2), cbind(c("0-foo", "1-foo")))
 })
 
-test_that("old school labellers still work", {
+test_that("old school labellers are deprecated", {
   my_labeller <- function(variable, value) {
     paste0("var = ", as.character(value))
   }
 
-  expect_snapshot_warning(p <-
-    ggplot(mtcars, aes(disp, drat)) +
-    geom_point() +
-    facet_grid(~cyl, labeller = my_labeller))
-
-  expected_labels <- cbind(paste("var =", c(4, 6, 8)))
-  expect_identical(get_labels_matrix(p, "cols"), expected_labels)
+  lifecycle::expect_defunct(facet_grid(~cyl, labeller = my_labeller))
 })