Skip to content

Fixes Delete code for old versions of R #6632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2025
Merged

Fixes Delete code for old versions of R #6632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions R/backports.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,7 @@
# Backport fix from R 3.3:
# https://github.com/wch/r-source/commit/4efc81c98d262f93de9e7911aaa910f5c63cd00f
if (getRversion() < "3.3") {
absolute.units <- utils::getFromNamespace("absolute.units", "grid")
absolute.units.unit <- utils::getFromNamespace("absolute.units.unit", "grid")
absolute.units.unit.list <- utils::getFromNamespace("absolute.units.unit.list", "grid")
absolute.units.unit.arithmetic <- utils::getFromNamespace("absolute.units.unit.arithmetic", "grid")

backport_unit_methods <- function() {
registerS3method("absolute.units", "unit", absolute.units.unit)
registerS3method("absolute.units", "unit.list", absolute.units.unit.list)
registerS3method("absolute.units", "unit.arithmetic", absolute.units.unit.arithmetic)
}
} else {
backport_unit_methods <- function() {}
}

# enable usage of <S7_object>@name in package code
#' @rawNamespace if (getRversion() < "4.3.0") importFrom("S7", "@")
NULL

on_load(backport_unit_methods())

unitType <- function(x) {
unit <- attr(x, "unit")
if (!is.null(unit)) {
Expand Down
16 changes: 0 additions & 16 deletions R/geom-polygon.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ GeomPolygon <- ggproto("GeomPolygon", Geom,
)
)
} else {
if (getRversion() < "3.6") {
cli::cli_abort("Polygons with holes requires R 3.6 or above.")
}
# Sort by group to make sure that colors, fill, etc. come in same order
munched <- munched[order(munched$group, munched$subgroup), ]
id <- match(munched$subgroup, unique0(munched$subgroup))
Expand Down Expand Up @@ -177,16 +174,3 @@ GeomPolygon <- ggproto("GeomPolygon", Geom,
#' p
#' }
geom_polygon <- make_constructor(GeomPolygon)

# Assigning pathGrob in .onLoad ensures that packages that subclass GeomPolygon
# do not install with error `possible error in 'pathGrob(munched$x, munched$y, ':
# unused argument (pathId = munched$group)` despite the fact that this is correct
# usage
pathGrob <- NULL
on_load(
if (getRversion() < as.numeric_version("3.6")) {
pathGrob <- function(..., pathId.lengths) {
grid::pathGrob(...)
}
}
)
Loading