Skip to content

Commit 7658827

Browse files
committed
replace is.formula() with rlang::is_formula()
1 parent 8f72633 commit 7658827

File tree

6 files changed

+5
-7
lines changed

6 files changed

+5
-7
lines changed

R/aes.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ aes_ <- function(x, y, ...) {
302302
caller_env <- parent.frame()
303303

304304
as_quosure_aes <- function(x) {
305-
if (is.formula(x) && length(x) == 2) {
305+
if (is_formula(x) && length(x) == 2) {
306306
as_quosure(x)
307307
} else if (is.null(x) || is.call(x) || is.name(x) || is.atomic(x)) {
308308
new_aesthetic(x, caller_env)

R/axis-secondary.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ set_sec_axis <- function(sec.axis, scale) {
135135
cli::cli_abort("Discrete secondary axes must have the {.fn identity} transformation.")
136136
}
137137
}
138-
if (is.formula(sec.axis)) sec.axis <- sec_axis(sec.axis)
138+
if (is_formula(sec.axis)) sec.axis <- sec_axis(sec.axis)
139139
if (!is.sec_axis(sec.axis)) {
140140
cli::cli_abort("Secondary axes must be specified using {.fn sec_axis}.")
141141
}

R/labeller.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ as_labeller <- function(x, default = label_value, multi_line = TRUE) {
296296
x(labels)
297297
} else if (is.function(x)) {
298298
default(lapply(labels, x))
299-
} else if (is.formula(x)) {
299+
} else if (is_formula(x)) {
300300
default(lapply(labels, as_function(x)))
301301
} else if (is.character(x)) {
302302
default(lapply(labels, function(label) x[label]))

R/quick-plot.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ qplot <- function(x, y, ..., data, facets = NULL, margins = FALSE,
139139

140140
if (is.null(facets)) {
141141
p <- p + facet_null()
142-
} else if (is.formula(facets) && length(facets) == 2) {
142+
} else if (is_formula(facets) && length(facets) == 2) {
143143
p <- p + facet_wrap(facets)
144144
} else {
145145
p <- p + facet_grid(rows = deparse(facets), margins = margins)

R/stat-function.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ StatFunction <- ggproto("StatFunction", Stat,
7070
}
7171
}
7272

73-
if (is.formula(fun)) fun <- as_function(fun)
73+
if (is_formula(fun)) fun <- as_function(fun)
7474

7575
y_out <- inject(fun(x_trans, !!!args))
7676
if (!is.null(scales$y) && !scales$y$is_discrete()) {

R/utilities.R

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,6 @@ compact <- function(x) {
321321
x[!null]
322322
}
323323

324-
is.formula <- function(x) inherits(x, "formula")
325-
326324
dispatch_args <- function(f, ...) {
327325
args <- list(...)
328326
formals <- formals(f)

0 commit comments

Comments
 (0)