check_labeller() performs an update

teunbrand · teunbrand · commit 8533322d1806 · 2024-09-03T14:28:34.000+02:00
diff --git a/R/facet-grid-.R b/R/facet-grid-.R
@@ -177,7 +177,7 @@ facet_grid <- function(rows = NULL, cols = NULL, scales = "fixed",
   facets_list <- grid_as_facets_list(rows, cols)
 
   # Check for deprecated labellers
-  labeller <- check_labeller(labeller)
+  labeller <- update_labeller(labeller)
 
   ggproto(NULL, FacetGrid,
     shrink = shrink,
diff --git a/R/facet-wrap.R b/R/facet-wrap.R
@@ -174,7 +174,7 @@ facet_wrap <- function(facets, nrow = NULL, ncol = NULL, scales = "fixed",
   )
 
   # Check for deprecated labellers
-  labeller <- check_labeller(labeller)
+  labeller <- update_labeller(labeller)
 
   # Flatten all facets dimensions into a single one
   facets <- wrap_as_facets_list(facets)
diff --git a/R/labeller.R b/R/labeller.R
@@ -590,7 +590,7 @@ assemble_strips <- function(grobs, theme, horizontal = TRUE, clip) {
 }
 
 # Check for old school labeller
-check_labeller <- function(labeller) {
+update_labeller <- function(labeller) {
   labeller <- match.fun(labeller)
   is_deprecated <- all(c("variable", "value") %in% names(formals(labeller)))
 

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ facet_wrap <- function(facets, nrow = NULL, ncol = NULL, scales = "fixed",`
`174`	`174`	`)`
`175`	`175`
`176`	`176`	`# Check for deprecated labellers`
`177`		`- labeller <- check_labeller(labeller)`
	`177`	`+ labeller <- update_labeller(labeller)`
`178`	`178`
`179`	`179`	`# Flatten all facets dimensions into a single one`
`180`	`180`	`facets <- wrap_as_facets_list(facets)`
Original file line number	Diff line number	Diff line change
`@@ -590,7 +590,7 @@ assemble_strips <- function(grobs, theme, horizontal = TRUE, clip) {`
`590`	`590`	`}`
`591`	`591`
`592`	`592`	`# Check for old school labeller`
`593`		`-check_labeller <- function(labeller) {`
	`593`	`+update_labeller <- function(labeller) {`
`594`	`594`	`labeller <- match.fun(labeller)`
`595`	`595`	`is_deprecated <- all(c("variable", "value") %in% names(formals(labeller)))`
`596`	`596`