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

hadley · hadley · commit 3939d3913ffd · 2016-12-28T13:15:50.000-06:00
diff --git a/R/format.R b/R/format.R
@@ -31,7 +31,7 @@ obj_sum.blob <- function(x) {
 #' @importFrom tibble is_vector_s3
 is_vector_s3.blob <- function(x) TRUE
 
-blob_size <- function(x, digits = 3, trim = TRUE) {
+blob_size <- function(x, digits = 3, trim = TRUE, ...) {
   x <- vapply(x, length, integer(1))
 
   power <- min(floor(log(abs(x), 1000)), 4)
@@ -42,7 +42,7 @@ blob_size <- function(x, digits = 3, trim = TRUE) {
     x <- x / (1024 ^ power)
   }
 
-  x1 <- signif(x, digits = digits)
+  x1 <- signif(x, digits = digits %||% 3)
   x2 <- format(x1, big.mark = ",", scientific = FALSE, trim = trim)
   paste0(x2, " ", unit)
 }
diff --git a/R/util.R b/R/util.R
@@ -11,3 +11,4 @@ is_raw_list <- function(x) {
   TRUE
 }
 
+`%||%` <- function(x, y) if (is.null(x)) y else x

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ obj_sum.blob <- function(x) {`
`31`	`31`	`#' @importFrom tibble is_vector_s3`
`32`	`32`	`is_vector_s3.blob <- function(x) TRUE`
`33`	`33`
`34`		`-blob_size <- function(x, digits = 3, trim = TRUE) {`
	`34`	`+blob_size <- function(x, digits = 3, trim = TRUE, ...) {`
`35`	`35`	`x <- vapply(x, length, integer(1))`
`36`	`36`
`37`	`37`	`power <- min(floor(log(abs(x), 1000)), 4)`
`@@ -42,7 +42,7 @@ blob_size <- function(x, digits = 3, trim = TRUE) {`
`42`	`42`	`x <- x / (1024 ^ power)`
`43`	`43`	`}`
`44`	`44`
`45`		`- x1 <- signif(x, digits = digits)`
	`45`	`+ x1 <- signif(x, digits = digits %\|\|% 3)`
`46`	`46`	`x2 <- format(x1, big.mark = ",", scientific = FALSE, trim = trim)`
`47`	`47`	`paste0(x2, " ", unit)`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,3 +11,4 @@ is_raw_list <- function(x) {`
`11`	`11`	`TRUE`
`12`	`12`	`}`
`13`	`13`
	`14`	+`%\|\|%` <- function(x, y) if (is.null(x)) y else x