Merge branch 'f-#244-rlang'. Closes #244

- Use `rlang` functions (#244).
tidyverse · May 6, 2017 · 748cfe9 · 748cfe9
2 parents 21a40f5 + 2bd2dda
commit 748cfe9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/R/tibble.R b/R/tibble.R
@@ -94,14 +94,14 @@ check_tibble <- function(x) {
   }
 
   # Types
-  is_1d <- vapply(x, is_1d, logical(1))
+  is_1d <- map_lgl(x, is_1d)
   if (any(!is_1d)) {
     invalid_df("Each variable must be a 1d atomic vector or list", x, !is_1d)
   }
 
-  x[] <- lapply(x, strip_dim)
+  x[] <- map(x, strip_dim)
 
-  posixlt <- vapply(x, inherits, "POSIXlt", FUN.VALUE = logical(1))
+  posixlt <- map_lgl(x, inherits, "POSIXlt")
   if (any(posixlt)) {
     invalid_df("Date/times must be stored as POSIXct, not POSIXlt", x, posixlt)
   }
@@ -115,7 +115,7 @@ recycle_columns <- function(x) {
   }
 
   # Validate column lengths
-  lengths <- vapply(x, NROW, integer(1))
+  lengths <- map_int(x, NROW)
   max <- max(lengths)
 
   bad_len <- lengths != 1L & lengths != max
@@ -125,7 +125,7 @@ recycle_columns <- function(x) {
 
   short <- lengths == 1
   if (max != 1L && any(short)) {
-    x[short] <- lapply(x[short], rep, max)
+    x[short] <- map(x[short], rep, max)
   }
 
   x

diff --git a/R/utils.r b/R/utils.r
@@ -39,11 +39,11 @@ safe_match <- function(x, table) {
 }
 
 stopc <- function(...) {
-  stop(..., call. = FALSE, domain = NA)
+  abort(paste0(...))
 }
 
 warningc <- function(...) {
-  warning(..., call. = FALSE, domain = NA)
+  warn(paste0(...))
 }
 
 nchar_width <- function(x) {