Fix GHA issues

Author: chartgerink

R/make_linelist.R

@@ -127,13 +127,13 @@ make_linelist <- function(x,
   checkmate::assert_logical(strict)
   checkmate::assert_logical(allow_extra)
 
-  args <- rlang::list2(...)
+  labs <- rlang::list2(...)
 
   # We replace default values with user-provided ones, and then
   # tag each variable in turn. Validation the tagged variables is done
   # elsewhere.
   lbl <- modify_defaults(label_defaults(),
-    args,
+    labs,
     allow_extra = allow_extra
   )
   # Retain only those lbl list values whose name is present in x if !strict

R/modify_defaults.R

@@ -28,12 +28,12 @@ modify_defaults <- function(defaults, x, allow_extra = FALSE) {
   # 2. Replace the names in defaults, of those matching elements, with the names
   # of the matching elements in x
   for (label in matching_labels) {
-    match <- defaults == label
+    matchDefaults <- defaults == label
     matchX <- x == label
-    if (sum(match) > 1) stop("Duplicates present for default labels. Please
-                             provide unique variables for labels and remove any
-                             duplicates.")
-    names(result)[match] <- names(x)[matchX]
+    if (sum(matchDefaults) > 1) stop("Duplicates present for default labels.
+                              Please provide unique variables for labels and
+                              remove any duplicates.", call. = FALSE)
+    names(result)[matchDefaults] <- names(x)[matchX]
   }
 
   # 3. If allow_extra is FALSE and there are elements in x that are not in
@@ -42,7 +42,8 @@ modify_defaults <- function(defaults, x, allow_extra = FALSE) {
     extra_elements <- setdiff(unlist(x), unlist(defaults))
     if (length(extra_elements) > 0) {
       stop(
-        "There are labels in x that are not defaults and allow_extra is FALSE"
+        "There are labels in x that are not defaults and allow_extra is FALSE",
+        call. = FALSE
       )
     }
   }

inst/WORDLIST

@@ -6,19 +6,22 @@ ORCID
 PII
 R's
 RECON
+RStudio
 SaMD
 codecov
 conceptor
 cran
 dplyr
 epi
 etc
+favor
 github
 lifecycle
 linelists
 pkgdown
 rlang
 rlang's
+safeframe
 testthat
 tidyselect
 tidyverse