Prefer compact()

r-dbi · Jan 11, 2024 · 2fbe7ac · 2fbe7ac
1 parent 5d492e5
commit 2fbe7ac
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/R/tweaks.R b/R/tweaks.R
@@ -145,7 +145,7 @@ make_tweaks <- function(envir = parent.frame()) {
         }
       }
       ret <- .(list_call)
-      ret <- ret[!vapply(ret, is.null, logical(1L))]
+      ret <- compact(ret)
       structure(ret, class = "DBItest_tweaks")
     },
     as.environment(list(list_call = list_call))

diff --git a/R/utils.R b/R/utils.R
@@ -68,11 +68,6 @@ random_table_name <- function(n = 10) {
   paste0("dbit", paste(sample(letters, n, replace = TRUE), collapse = ""))
 }
 
-compact <- function(x) {
-  x[!vapply(x, is.null, logical(1L))]
-}
-
-
 try_silent <- function(code) {
   tryCatch(
     code,

diff --git a/tests/testthat/test-consistency.R b/tests/testthat/test-consistency.R
@@ -1,5 +1,5 @@
 test_that("no unnamed specs", {
-  tests <- spec_all[!vapply(spec_all, is.null, logical(1L))]
+  tests <- compact(spec_all)
   vicinity <- NULL
   if (any(names(tests) == "")) {
     vicinity <- sort(unique(unlist(