From 429b16897307a79569fd4db1474d91c4700b7b12 Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Sun, 13 Oct 2024 13:41:51 -0700 Subject: [PATCH 1/2] Fix roxygen2 issue with all/all.equal ambiguity Signed-off-by: Michael Chirico --- R/testhat-helpers.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/R/testhat-helpers.R b/R/testhat-helpers.R index 52ca04b49..17ba5812e 100644 --- a/R/testhat-helpers.R +++ b/R/testhat-helpers.R @@ -19,7 +19,8 @@ #' #' @seealso [base::all.equal()] #' @keywords internal -#' +#' @method all.equal join_keys +#' @exportS3Method all.equal join_keys all.equal.join_keys <- function(target, current, ...) { .as_map <- function(.x) { old_attributes <- attributes(.x) From a3d978547cd2db86659002299c7a2ad6619ba93f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Fri, 8 Nov 2024 12:31:04 +0100 Subject: [PATCH 2/2] Documentation changes due to the PR --- NAMESPACE | 1 + man/all.equal.join_keys.Rd | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NAMESPACE b/NAMESPACE index a126ccc47..60f93aba1 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -9,6 +9,7 @@ S3method("names<-",join_keys) S3method("names<-",teal_data) S3method("parents<-",join_keys) S3method("parents<-",teal_data) +S3method(all.equal,join_keys) S3method(c,join_key_set) S3method(c,join_keys) S3method(format,join_keys) diff --git a/man/all.equal.join_keys.Rd b/man/all.equal.join_keys.Rd index 813654397..ae8ce55c9 100644 --- a/man/all.equal.join_keys.Rd +++ b/man/all.equal.join_keys.Rd @@ -4,7 +4,7 @@ \alias{all.equal.join_keys} \title{Test if two objects are (nearly) equal} \usage{ -\method{all}{equal.join_keys}(target, current, ...) +\method{all.equal}{join_keys}(target, current, ...) } \arguments{ \item{target}{\R object.}