Apply check in functions

Author: teunbrand

R/all-classes.R

@@ -253,21 +253,8 @@ class_labels <- S7::new_class(
   "labels", parent = class_S3_gg,
   constructor = function(labels = list(), ...) {
     warn_dots_empty()
+    check_named(labels, I("labels"))
     S7::new_object(labels)
-  },
-  validator = function(self) {
-    if (!is.list(self)) {
-      return("labels must be a list.")
-    }
-    if (!is_named2(self)) {
-      return("every label must be named.")
-    }
-    dups <- unique(names(self)[duplicated(names(self))])
-    if (length(dups) > 0) {
-      dups <- oxford_comma(dups, final = "and")
-      return(paste0("labels cannot contain duplicate names (", dups, ")."))
-    }
-    return(NULL)
   }
 )
 

R/limits.R

@@ -81,10 +81,7 @@
 #'
 lims <- function(...) {
   args <- list2(...)
-
-  if (!is_named2(args)) {
-    cli::cli_abort("All arguments must be named.")
-  }
+  check_named(args, arg = I("Arguments"))
   env <- current_env()
   Map(limits, args, names(args), rep(list(env), length(args)))
 }

R/theme-elements.R

@@ -746,10 +746,7 @@ check_element_tree <- function(x, arg = caller_arg(x), call = caller_env()) {
   if (length(x) < 1) {
     return(invisible(NULL))
   }
-
-  if (!is_named(x)) {
-    cli::cli_abort("{.arg {arg}} must have names.", call = call)
-  }
+  check_named(x, arg = arg, call = call)
 
   # All elements should be constructed with `el_def()`
   fields <- names(el_def())

tests/testthat/_snaps/limits.md

@@ -1,6 +1,6 @@
 # limits() throw meaningful errors
 
-    All arguments must be named.
+    Arguments must have names.
 
 ---