Merge branch 'master' of github.com:hadley/ggplot2

Author: hadley

NEWS.md

@@ -2,6 +2,8 @@
 
 ## Bug fixes and minor improvements
 
+* Removed a superfluous comma in `theme-defaults.r` code (@jschoeley)
+
 * Fixed a compatibility issue with `ggproto` and R versions prior to 3.1.2.
   (#1444)
 

R/stat-function.r

@@ -82,7 +82,7 @@ StatFunction <- ggproto("StatFunction", Stat,
 
     data.frame(
       x = xseq,
-      y = do.call(fun, c(list(quote(scales$x$trans$inv(xseq))), args))
+      y = do.call(fun, c(list(quote(scales$x$trans$inverse(xseq))), args))
     )
   }
 )

R/theme-defaults.r

@@ -86,7 +86,7 @@ theme_grey <- function(base_size = 11, base_family = "") {
                          ),
     axis.title.y =       element_text(
                            angle = 90,
-                           margin = margin(r = 0.8 * half_line, l = 0.8 * half_line / 2),
+                           margin = margin(r = 0.8 * half_line, l = 0.8 * half_line / 2)
                          ),
 
     legend.background =  element_rect(colour = NA),

ggplot2.Rproj

@@ -17,5 +17,5 @@ StripTrailingWhitespace: Yes
 
 BuildType: Package
 PackageUseDevtools: Yes
-PackageInstallArgs: --no-multiarch --with-keep.source
+PackageInstallArgs: --no-multiarch --with-keep.source --run-donttest
 PackageRoxygenize: rd,collate,namespace

tests/testthat/test-stat-bin2d.R

@@ -8,8 +8,8 @@ test_that("binwidth is respected", {
   out <- layer_data(base)
   expect_equal(nrow(out), 2)
   # Adjust tolerance to account for fuzzy breaks adjustment
-  expect_equal(out$xmin, c(1, 1.75), tol = 1e-7)
-  expect_equal(out$xmax, c(1.25, 2), tol = 1e-7)
+  expect_equal(out$xmin, c(1, 1.75), tolerance = 1e-7)
+  expect_equal(out$xmax, c(1.25, 2), tolerance = 1e-7)
 })
 
 test_that("breaks override binwidth", {