update_labeller() -> fix_labeller()

teunbrand · teunbrand · commit 7949e20ecd48 · 2024-12-16T11:37:58.000+01: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 <- update_labeller(labeller)
+  labeller <- fix_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 <- update_labeller(labeller)
+  labeller <- fix_labeller(labeller)
 
   # Flatten all facets dimensions into a single one
   facets <- compact_facets(facets)
diff --git a/R/labeller.R b/R/labeller.R
@@ -577,8 +577,8 @@ assemble_strips <- function(grobs, theme, horizontal = TRUE, clip) {
   })
 }
 
-# Check for old school labeller
-update_labeller <- function(labeller) {
+# Repair old school labeller
+fix_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 <- update_labeller(labeller)`
	`177`	`+ labeller <- fix_labeller(labeller)`
`178`	`178`
`179`	`179`	`# Flatten all facets dimensions into a single one`
`180`	`180`	`facets <- compact_facets(facets)`
Original file line number	Diff line number	Diff line change
`@@ -577,8 +577,8 @@ assemble_strips <- function(grobs, theme, horizontal = TRUE, clip) {`
`577`	`577`	`})`
`578`	`578`	`}`
`579`	`579`
`580`		`-# Check for old school labeller`
`581`		`-update_labeller <- function(labeller) {`
	`580`	`+# Repair old school labeller`
	`581`	`+fix_labeller <- function(labeller) {`
`582`	`582`	`labeller <- match.fun(labeller)`
`583`	`583`	`is_deprecated <- all(c("variable", "value") %in% names(formals(labeller)))`
`584`	`584`