More error tidying

Author: hadley

R/expect-setequal.R

@@ -131,35 +131,6 @@ expect_in <- function(object, expected) {
 
 # Helpers ----------------------------------------------------------------------
 
-check_map_names <- function(
-  x,
-  error_arg = caller_arg(x),
-  error_call = caller_env()
-) {
-  nms <- names2(x)
-
-  if (anyDuplicated(nms)) {
-    dups <- unique(nms[duplicated(nms)])
-    cli::cli_abort(
-      c(
-        "All elements in {.arg {error_arg}} must have unique names.",
-        x = "Duplicate names: {.str {dups}}"
-      ),
-      call = error_call
-    )
-  }
-  if (any(nms == "")) {
-    empty <- which(nms == "")
-    cli::cli_abort(
-      c(
-        "All elements in {.arg {error_arg}} must have names.",
-        x = "Empty names at position{?s}: {empty}"
-      ),
-      call = error_call
-    )
-  }
-}
-
 check_vector <- function(
   x,
   error_arg = caller_arg(x),

R/mock2.R

@@ -185,18 +185,18 @@ local_bindings_rebind <- function(..., .env = .frame, .frame = caller_env()) {
   invisible()
 }
 
-dev_package <- function() {
+dev_package <- function(call = caller_env()) {
   if (is_testing() && testing_package() != "") {
     testing_package()
   } else {
     loaded <- loadedNamespaces()
     is_dev <- map_lgl(loaded, function(x) !is.null(pkgload::dev_meta(x)))
     if (sum(is_dev) == 0) {
-      cli::cli_abort("No packages loaded with pkgload")
+      cli::cli_abort("No packages loaded with pkgload", call = call)
     } else if (sum(is_dev) == 1) {
       loaded[is_dev]
     } else {
-      cli::cli_abort("Multiple packages loaded with pkgload")
+      cli::cli_abort("Multiple packages loaded with pkgload", call = call)
     }
   }
 }

R/snapshot.R

@@ -408,13 +408,13 @@ local_snapshot_dir <- function(snap_names, .env = parent.frame()) {
 # if transform() wiped out the full message, don't indent, #1487
 indent <- function(x) if (length(x)) paste0("  ", x) else x
 
-check_variant <- function(x) {
+check_variant <- function(x, call = caller_env()) {
   if (is.null(x)) {
     "_default"
   } else if (is_string(x)) {
     x
   } else {
-    cli::cli_abort("If supplied, {.arg variant} must be a string.")
+    cli::cli_abort("If supplied, {.arg variant} must be a string.", call = call)
   }
 }