Merge pull request #31 from tidyverse/master

Sync Fork from Upstream Repo

Author: sthagen

DESCRIPTION

@@ -35,7 +35,7 @@ Imports:
     isoband,
     MASS,
     mgcv,
-    rlang (>= 0.3.0),
+    rlang (>= 0.4.10),
     scales (>= 0.5.0),
     stats,
     tibble,

NEWS.md

@@ -24,6 +24,10 @@
 
 * ggplot2 now requires R >= 3.3 (#4247).
 
+* ggplot2 now uses `rlang::check_installed()` to check if a suggested package is
+  installed, which will offer to install the package before continuing (#4375, 
+  @malcolmbarrett)
+
 # ggplot2 3.3.3
 This is a small patch release mainly intended to address changes in R and CRAN.
 It further changes the licensing model of ggplot2 to an MIT license.

R/coord-map.r

@@ -318,6 +318,7 @@ CoordMap <- ggproto("CoordMap", Coord,
 
 
 mproject <- function(coord, x, y, orientation) {
+  check_installed("mapproj", reason = "for `coord_map()`")
   suppressWarnings(mapproj::mapproject(x, y,
     projection = coord$projection,
     parameters  = coord$params,

R/coord-sf.R

@@ -62,7 +62,9 @@ CoordSf <- ggproto("CoordSf", CoordCartesian,
         return(layer_data)
       }
 
-      sf::st_transform(layer_data, params$crs)
+      idx <- vapply(layer_data, inherits, what = "sfc", FUN.VALUE = logical(1L))
+      layer_data[idx] <- lapply(layer_data[idx], sf::st_transform, crs = params$crs)
+      layer_data
     })
   },
 

R/fortify-map.r

@@ -75,7 +75,7 @@ fortify.map <- function(model, data, ...) {
 #'   coord_map("albers",  lat0 = 45.5, lat1 = 29.5)
 #' }
 map_data <- function(map, region = ".", exact = FALSE, ...) {
-  try_require("maps", "map_data")
+  check_installed("maps", reason = "for `map_data()`")
   map_obj <- maps::map(map, region, exact = exact, plot = FALSE, fill = TRUE, ...)
   fortify(map_obj)
 }

R/fortify.r

@@ -17,9 +17,7 @@ fortify.data.frame <- function(model, data, ...) model
 fortify.tbl_df <- function(model, data, ...) model
 #' @export
 fortify.tbl <- function(model, data, ...) {
-  if (!requireNamespace("dplyr", quietly = TRUE)) {
-    abort("dplyr must be installed to work with tbl objects")
-  }
+  check_installed("dplyr", reason = "to work with `tbl` objects")
   dplyr::collect(model)
 }
 #' @export
@@ -31,9 +29,7 @@ fortify.function <- function(model, data, ...) model
 fortify.formula <- function(model, data, ...) as_function(model)
 #' @export
 fortify.grouped_df <- function(model, data, ...) {
-  if (!requireNamespace("dplyr", quietly = TRUE)) {
-    abort("dplyr must be installed to work with grouped_df objects")
-  }
+  check_installed("dplyr", reason = "to work with `grouped_df` objects")
   model$.group <- dplyr::group_indices(model)
   model
 }

R/stat-binhex.r

@@ -49,7 +49,7 @@ StatBinhex <- ggproto("StatBinhex", Stat,
 
   compute_group = function(data, scales, binwidth = NULL, bins = 30,
                            na.rm = FALSE) {
-    try_require("hexbin", "stat_binhex")
+    check_installed("hexbin", reason = "for `stat_binhex()`")
 
     binwidth <- binwidth %||% hex_binwidth(bins, scales)
     wt <- data$weight %||% rep(1L, nrow(data))

R/stat-quantile.r

@@ -50,7 +50,7 @@ StatQuantile <- ggproto("StatQuantile", Stat,
   compute_group = function(data, scales, quantiles = c(0.25, 0.5, 0.75),
                            formula = NULL, xseq = NULL, method = "rq",
                            method.args = list(), lambda = 1, na.rm = FALSE) {
-    try_require("quantreg", "stat_quantile")
+    check_installed("quantreg", reason = "for `stat_quantile()`")
 
     if (is.null(formula)) {
       if (method == "rqss") {

R/stat-summary-hex.r

@@ -43,7 +43,7 @@ StatSummaryHex <- ggproto("StatSummaryHex", Stat,
 
   compute_group = function(data, scales, binwidth = NULL, bins = 30, drop = TRUE,
                            fun = "mean", fun.args = list()) {
-    try_require("hexbin", "stat_summary_hex")
+    check_installed("hexbin", reason = "for `stat_summary_hex()`")
 
     binwidth <- binwidth %||% hex_binwidth(bins, scales)
     fun <- as_function(fun)

R/stat-summary.r

@@ -245,8 +245,7 @@ NULL
 wrap_hmisc <- function(fun) {
 
   function(x, ...) {
-    if (!requireNamespace("Hmisc", quietly = TRUE))
-      abort("Hmisc package required for this function")
+    check_installed("Hmisc")
 
     fun <- getExportedValue("Hmisc", fun)
     result <- do.call(fun, list(x = quote(x), ...))