Skip to content

Commit c8f0ae6

Browse files
committed
replace is.derived() with is_derived()
1 parent fcd9c4b commit c8f0ae6

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

R/axis-secondary.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ set_sec_axis <- function(sec.axis, scale) {
150150
derive <- function() {
151151
structure(list(), class = "derived")
152152
}
153-
is.derived <- function(x) {
153+
is_derived <- function(x) {
154154
inherits(x, "derived")
155155
}
156156
#' @rdname ggplot2-ggproto
@@ -182,8 +182,8 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
182182
if (!is.function(transform)) {
183183
cli::cli_abort("Transformation for secondary axes must be a function.")
184184
}
185-
if (is.derived(self$name) && !is_waiver(scale$name)) self$name <- scale$name
186-
if (is.derived(self$breaks)) self$breaks <- scale$breaks
185+
if (is_derived(self$name) && !is_waiver(scale$name)) self$name <- scale$name
186+
if (is_derived(self$breaks)) self$breaks <- scale$breaks
187187
if (is_waiver(self$breaks)) {
188188
if (scale$is_discrete()) {
189189
self$breaks <- setNames(nm = scale$get_breaks())
@@ -197,8 +197,8 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
197197
}
198198
}
199199
}
200-
if (is.derived(self$labels)) self$labels <- scale$labels
201-
if (is.derived(self$guide)) self$guide <- scale$guide
200+
if (is_derived(self$labels)) self$labels <- scale$labels
201+
if (is_derived(self$guide)) self$guide <- scale$guide
202202
},
203203

204204
transform_range = function(self, range) {

R/coord-sf.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ view_scales_from_graticule <- function(graticule, scale, aesthetic,
769769
if (scale$position != position) {
770770
# Try to use secondary axis' guide
771771
guide <- scale$secondary.axis$guide %||% waiver()
772-
if (is.derived(guide)) {
772+
if (is_derived(guide)) {
773773
guide <- scale$guide
774774
}
775775
} else {

R/layout.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ Layout <- ggproto("Layout", NULL,
276276

277277
primary <- scale$make_title(prim_guide, prim_scale, prim_label)
278278
secondary <- scale$make_sec_title(seco_guide, seco_scale, seco_label)
279-
if (is.derived(secondary)) {
279+
if (is_derived(secondary)) {
280280
secondary <- primary
281281
}
282282

0 commit comments

Comments
 (0)