rlang upkeep (#2655)

Import rlang, bring in the standalone checkers, and use them in a couple of places.

Author: hadley

.lintr.R

@@ -16,3 +16,8 @@ linters <- list(lintr::undesirable_function_linter(
   ),
   symbol_is_undesirable = FALSE
 ))
+
+exclusions <- list(
+  "R/import-standalone-obj-type.R",
+  "R/import-standalone-types-check.R"
+)

NAMESPACE

@@ -83,6 +83,7 @@ export(uses_testthat)
 export(wd)
 export(with_debug)
 import(fs)
+import(rlang)
 importFrom(ellipsis,check_dots_used)
 importFrom(lifecycle,deprecated)
 importFrom(memoise,memoise)

R/active.R

@@ -1,9 +1,6 @@
 find_active_file <- function(arg = "file", call = parent.frame()) {
   if (!is_rstudio_running()) {
-    cli::cli_abort(
-      "Argument {.arg {arg}} is missing, with no default",
-      call = call
-    )
+    cli::cli_abort("{.arg {arg}} is absent but must be supplied.", call = call)
   }
   normalizePath(rstudioapi::getSourceEditorContext()$path)
 }

R/build-readme.R

@@ -18,11 +18,11 @@ build_rmd <- function(
   ...,
   quiet = TRUE
 ) {
-  check_dots_used(action = getOption("devtools.ellipsis_action", rlang::warn))
+  check_dots_used(action = getOption("devtools.ellipsis_action", warn))
 
   pkg <- as.package(path)
 
-  rlang::check_installed("rmarkdown")
+  check_installed("rmarkdown")
   save_all()
 
   paths <- files

R/build-site.R

@@ -7,7 +7,7 @@
 #' @param ...  Additional arguments passed to [pkgdown::build_site()].
 #' @export
 build_site <- function(path = ".", ...) {
-  rlang::check_installed("pkgdown")
+  check_installed("pkgdown")
 
   save_all()
   pkgdown::build_site(pkg = path, ...)

R/check-mac.R

@@ -19,7 +19,7 @@ check_mac_release <- function(
   quiet = FALSE,
   ...
 ) {
-  check_dots_used(action = getOption("devtools.ellipsis_action", rlang::warn))
+  check_dots_used(action = getOption("devtools.ellipsis_action", warn))
 
   check_mac(
     pkg = pkg,
@@ -42,7 +42,7 @@ check_mac_devel <- function(
   quiet = FALSE,
   ...
 ) {
-  check_dots_used(action = getOption("devtools.ellipsis_action", rlang::warn))
+  check_dots_used(action = getOption("devtools.ellipsis_action", warn))
 
   check_mac(
     pkg = pkg,
@@ -100,7 +100,7 @@ check_mac <- function(
 
   url <- "https://mac.r-project.org/macbuilder/v1/submit"
 
-  rlang::check_installed("httr")
+  check_installed("httr")
   body <- list(
     pkgfile = httr::upload_file(built_path),
     rflavor = tolower(version)

R/check-win.R

@@ -28,7 +28,7 @@ check_win_devel <- function(
   quiet = FALSE,
   ...
 ) {
-  check_dots_used(action = getOption("devtools.ellipsis_action", rlang::warn))
+  check_dots_used(action = getOption("devtools.ellipsis_action", warn))
 
   check_win(
     pkg = pkg,
@@ -51,7 +51,7 @@ check_win_release <- function(
   quiet = FALSE,
   ...
 ) {
-  check_dots_used(action = getOption("devtools.ellipsis_action", rlang::warn))
+  check_dots_used(action = getOption("devtools.ellipsis_action", warn))
 
   check_win(
     pkg = pkg,
@@ -74,7 +74,7 @@ check_win_oldrelease <- function(
   quiet = FALSE,
   ...
 ) {
-  check_dots_used(action = getOption("devtools.ellipsis_action", rlang::warn))
+  check_dots_used(action = getOption("devtools.ellipsis_action", warn))
 
   check_win(
     pkg = pkg,
@@ -200,7 +200,7 @@ change_maintainer_email <- function(path, email, call = parent.frame()) {
 }
 
 upload_ftp <- function(file, url, verbose = FALSE) {
-  rlang::check_installed("curl")
+  check_installed("curl")
 
   stopifnot(file_exists(file))
   stopifnot(is.character(url))

R/check.R

@@ -98,7 +98,7 @@ check <- function(
     show_env_vars(pkgbuild::compiler_flags(FALSE))
   }
 
-  check_dots_used(action = getOption("devtools.ellipsis_action", rlang::warn))
+  check_dots_used(action = getOption("devtools.ellipsis_action", warn))
 
   if (identical(vignettes, FALSE)) {
     args <- union(args, "--ignore-vignettes")

R/devtools-package.R

@@ -12,6 +12,7 @@
 ## usethis namespace: start
 #' @importFrom ellipsis check_dots_used
 #' @importFrom lifecycle deprecated
+#' @import rlang
 ## usethis namespace: end
 NULL