base and internal copies not the same

r-lib · Nov 21, 2024 · f6a5b61 · f6a5b61
1 parent 16896a0
commit f6a5b61
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -23,7 +23,7 @@ BugReports: https://github.com/r-lib/lintr/issues
 Depends:
     R (>= 4.0)
 Imports:
-    backports (>= 1.5.0),
+    backports (>= 1.1.7),
     cli (>= 3.4.0),
     codetools,
     digest,

diff --git a/R/utils.R b/R/utils.R
@@ -1,3 +1,12 @@
+`%||%` <- function(x, y) {
+  is_atomic_and_missing <- is.atomic(x[[1L]]) && is.na(x[[1L]])
+  if (is.null(x) || length(x) == 0L || is_atomic_and_missing) {
+    y
+  } else {
+    x
+  }
+}
+
 `%==%` <- function(x, y) {
   identical(x, y)
 }

diff --git a/R/zzz.R b/R/zzz.R
@@ -297,8 +297,6 @@ settings <- new.env(parent = emptyenv())
 
   # R>=4.1.0: ...names
   backports::import(pkgname, "...names")
-  # R>=4.4.0: %||%
-  backports::import(pkgname, "%||%")
 
   utils::assignInMyNamespace("default_settings", list(
     linters = default_linters,