Skip to content

Commit a9bb97e

Browse files
committed
add delayed S3 registration mechanism for R >= 3.6.0
1 parent 0629e16 commit a9bb97e

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ Imports: Rcpp, utils
1717
Suggests: tibble, pillar, dplyr, tidyr, testthat, knitr, rmarkdown
1818
LinkingTo: Rcpp (>= 0.12.10)
1919
ByteCompile: yes
20-
RoxygenNote: 6.1.0
20+
RoxygenNote: 6.1.1
2121
VignetteBuilder: knitr

NAMESPACE

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,15 @@ export(drop_quantities)
5656
export(parse_errors)
5757
export(parse_quantities)
5858
export(parse_units)
59-
export(pillar_shaft.quantities)
6059
export(quantities)
6160
export(set_quantities)
62-
export(type_sum.quantities)
61+
if(getRversion() >= "3.6.0") {
62+
S3method(pillar::type_sum, quantities)
63+
S3method(pillar::pillar_shaft, quantities)
64+
} else {
65+
export(type_sum.quantities)
66+
export(pillar_shaft.quantities)
67+
}
6368
import(errors)
6469
import(stats)
6570
import(units)

R/misc.R

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,19 @@ as.list.quantities <- function(x, ...)
120120
#' @param ... see \link[pillar]{pillar_shaft}.
121121
#'
122122
#' @name tibble
123-
#' @export type_sum.quantities
123+
#' @rawNamespace if(getRversion() >= "3.6.0") {
124+
#' S3method(pillar::type_sum, quantities)
125+
#' S3method(pillar::pillar_shaft, quantities)
126+
#' } else {
127+
#' export(type_sum.quantities)
128+
#' export(pillar_shaft.quantities)
129+
#' }
124130
type_sum.quantities <- function(x) {
125131
out <- gsub("\\[|\\]", "", paste(type_sum.errors(x), type_sum.units(x)))
126132
paste0("[", out, "]")
127133
}
128134

129135
#' @name tibble
130-
#' @export pillar_shaft.quantities
131136
pillar_shaft.quantities <- function(x, ...) {
132137
out <- pillar_shaft.errors(drop_units(x), ...)
133138
if (!requireNamespace("pillar", quietly = TRUE))

0 commit comments

Comments
 (0)