Merge branch 'tidyverse:main' into main

Author: Polkas

R/aes.r

@@ -268,7 +268,7 @@ aes_ <- function(x, y, ...) {
   deprecate_soft0(
     "3.0.0",
     "aes_()",
-    details = "Please use tidy evaluation ideoms with `aes()`"
+    details = "Please use tidy evaluation idioms with `aes()`"
   )
   mapping <- list(...)
   if (!missing(x)) mapping["x"] <- list(x)

R/geom-.r

@@ -240,7 +240,7 @@ check_aesthetics <- function(x, n) {
 
 check_linewidth <- function(data, name) {
   if (is.null(data$linewidth) && !is.null(data$size)) {
-    deprecate_soft0("3.4.0", I(paste0("Using the `size` aesthietic with ", name)), I("the `linewidth` aesthetic"))
+    deprecate_soft0("3.4.0", I(paste0("Using the `size` aesthetic with ", name)), I("the `linewidth` aesthetic"))
     data$linewidth <- data$size
   }
   data

tests/testthat/test-geom-hex.R

@@ -1,3 +1,5 @@
+skip_if_not_installed("hexbin")
+
 test_that("density and value summaries are available", {
   df <- data_frame(x = c(1, 1, 1, 2), y = c(1, 1, 1, 2))
   base <- ggplot(df, aes(x, y)) +

tests/testthat/test-stat-hex.R

@@ -1,3 +1,4 @@
+skip_if_not_installed("hexbin")
 test_that("can use length 1 binwidth", {
   df <- data_frame(x = c(1, 1, 2), y = c(1, 1, 2))
   p <- ggplot(df, aes(x, y)) + stat_binhex(binwidth = 1)