Skip to content

rlang upkeep #2655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hadley wants to merge 5 commits into
base: main
Choose a base branch
from
Open

rlang upkeep #2655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35e6539
Import rlang
hadley Jan 22, 2026
56d0194
Bring in the standalone checkers
hadley Jan 22, 2026
02d4eec
And use them in a few places
hadley Jan 22, 2026
ef1e32d
Revert version change
hadley Jan 22, 2026
79b7d25
Update snapshots
hadley Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export(uses_testthat)
export(wd)
export(with_debug)
import(fs)
import(rlang)
importFrom(cli,cat_bullet)
importFrom(cli,cat_rule)
importFrom(ellipsis,check_dots_used)
Expand Down
5 changes: 1 addition & 4 deletions R/active.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions R/build-readme.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions R/build-site.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
#' @return NULL
#' @export
build_site <- function(path = ".", quiet = TRUE, ...) {
rlang::check_installed("pkgdown")
check_installed("pkgdown")

save_all()

pkg <- as.package(path)

check_dots_used(action = getOption("devtools.ellipsis_action", rlang::warn))
check_dots_used(action = getOption("devtools.ellipsis_action", warn))

withr::with_temp_libpaths(action = "prefix", code = {
install(pkg = pkg$path, upgrade = "never", reload = FALSE, quiet = quiet)
Expand Down
6 changes: 3 additions & 3 deletions R/check-mac.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions R/check-win.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -184,7 +184,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))
Expand Down
2 changes: 1 addition & 1 deletion R/check.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions R/devtools-package.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

## usethis namespace: start
#' @importFrom lifecycle deprecated
#' @import rlang
## usethis namespace: end
NULL

Expand Down
Loading
Loading