Merge pull request #175 from mrc-ide/match_value_name

Propagate name parameter in match_value.
mrc-ide · Sep 5, 2024 · f580aff · f580aff
2 parents 859fbd3 + fd773ca
commit f580aff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: orderly2
 Title: Orderly Next Generation
-Version: 1.99.32
+Version: 1.99.33
 Authors@R: c(person("Rich", "FitzJohn", role = c("aut", "cre"),
                     email = "[email protected]"),
              person("Robert", "Ashton", role = "aut"),

diff --git a/R/util_assert.R b/R/util_assert.R
@@ -198,7 +198,7 @@ assert_directory_does_not_exist <- function(x, name = "Directory", arg = NULL,
 
 match_value <- function(x, choices, name = deparse(substitute(x)),
                         arg = name, call = NULL) {
-  assert_scalar_character(x, call = call, arg = arg)
+  assert_scalar_character(x, name = name, arg = arg, call = call)
   if (!(x %in% choices)) {
     cli::cli_abort(
       c("'{name}' must be one of {collapseq(choices)}",