Skip to content

Commit 4263d12

Browse files
Fix some lints (#6470)
* init * revert change in import-standalone
1 parent 7fb5760 commit 4263d12

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

R/theme.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ combine_elements <- function(e1, e2) {
990990

991991
# If e2 is 'richer' than e1, fill e2 with e1 parameters
992992
is_subclass <- !any(inherits(e2, class(e1), which = TRUE) == 0)
993-
is_subclass <- is_subclass && length(setdiff(class(e2), class(e1)) > 0)
993+
is_subclass <- is_subclass && length(setdiff(class(e2), class(e1))) > 0
994994
if (is_subclass) {
995995
new <- defaults(e1, e2)
996996
e2[names(new)] <- new

tests/testthat/test-layer.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ test_that("layer warns for constant aesthetics", {
148148
test_that("layer names can be resolved", {
149149

150150
p <- ggplot() + geom_point() + geom_point()
151-
expect_equal(names(p$layers), c("geom_point", "geom_point...2"))
151+
expect_named(p$layers, c("geom_point", "geom_point...2"))
152152

153153
p <- ggplot() + geom_point(name = "foo") + geom_point(name = "bar")
154-
expect_equal(names(p$layers), c("foo", "bar"))
154+
expect_named(p$layers, c("foo", "bar"))
155155

156156
l <- geom_point(name = "foobar")
157157
expect_snapshot(p + l + l, error = TRUE)

0 commit comments

Comments
 (0)