From 4b79edea95508ee96e05df325cf613ad6ec9831e Mon Sep 17 00:00:00 2001 From: olivroy <52606734+olivroy@users.noreply.github.com> Date: Wed, 29 Nov 2023 09:02:27 -0500 Subject: [PATCH] Remove ellipsis dependency in favour of rlang (#1875) * Update deprec-condition.R * Update expect-condition.R * Remove ellipsis dep --- DESCRIPTION | 1 - R/deprec-condition.R | 2 +- R/expect-condition.R | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index ce5bb36cb..384792847 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -22,7 +22,6 @@ Imports: cli (>= 3.6.1), desc (>= 1.4.2), digest (>= 0.6.33), - ellipsis (>= 0.3.2), evaluate (>= 0.21), jsonlite (>= 1.8.7), lifecycle (>= 1.0.3), diff --git a/R/deprec-condition.R b/R/deprec-condition.R index 74daf7253..15d6f8c28 100644 --- a/R/deprec-condition.R +++ b/R/deprec-condition.R @@ -129,7 +129,7 @@ get_messages <- function(x) { #' has been deprecated. #' #' @param x An error object. -#' @inheritParams ellipsis::dots_empty +#' @inheritParams rlang::args_dots_empty #' #' @details #' A few classes are hard-coded as uninformative: diff --git a/R/expect-condition.R b/R/expect-condition.R index 221d84f21..da927523e 100644 --- a/R/expect-condition.R +++ b/R/expect-condition.R @@ -255,7 +255,7 @@ expect_condition_matching <- function(base_class, info = NULL, label = NULL, trace_env = caller_env()) { - ellipsis::check_dots_used(action = warn) + check_dots_used(error = warning) matcher <- cnd_matcher( base_class,