Modify a few more conditions + require rlang 1.2.0 as they started exporting the functions used.

Author: olivroy

r/DESCRIPTION

@@ -39,7 +39,7 @@ Imports:
     methods,
     purrr,
     R6,
-    rlang (>= 1.0.0),
+    rlang (>= 1.2.0),
     stats,
     tidyselect (>= 1.0.0),
     utils,

r/R/csv.R

@@ -635,18 +635,18 @@ readr_to_csv_write_options <- function(
 #' write_csv_arrow(airquality, tf, write_options = csv_write_options(null_string = "-99"))
 #' @export
 csv_write_options <- function(
-  include_header = TRUE,
-  batch_size = 1024L,
-  null_string = "",
-  delimiter = ",",
-  eol = "\n",
-  quoting_style = c("Needed", "AllValid", "None")
+    include_header = TRUE,
+    batch_size = 1024L,
+    null_string = "",
+    delimiter = ",",
+    eol = "\n",
+    quoting_style = c("Needed", "AllValid", "None")
 ) {
   quoting_style <- match.arg(quoting_style)
   quoting_style_opts <- c("Needed", "AllValid", "None")
   quoting_style <- match(quoting_style, quoting_style_opts) - 1L
 
-  assert_that(is.logical(include_header))
+  check_bool(include_header)
   check_number_whole(batch_size, min = 1, allow_infinite = FALSE)
   check_string(delimiter)
   check_string(null_string, allow_na = FALSE)

r/R/dataset-factory.R

@@ -285,8 +285,8 @@ fsf_options <- function(factory_options, partitioning) {
   if (!is.null(factory_options$partition_base_dir)) {
     if (
       inherits(partitioning, "HivePartitioning") ||
-        (inherits(partitioning, "PartitioningFactory") &&
-          identical(partitioning$type_name, "hive"))
+      (inherits(partitioning, "PartitioningFactory") &&
+       identical(partitioning$type_name, "hive"))
     ) {
       warning(
         "factory_options$partition_base_dir is not meaningful for Hive partitioning",

r/R/dataset-scan.R

@@ -160,10 +160,8 @@ names.Scanner <- function(x) names(x$schema)
 
 #' @export
 head.Scanner <- function(x, n = 6L, ...) {
-  assert_is(n, c("numeric", "integer"))
-  assert_that(length(n) == 1)
   # Negative n requires knowing nrow(x), which requires a scan itself
-  assert_that(n >= 0)
+  check_number_decimal(n, min = 0)
   if (!is.integer(n)) {
     n <- floor(n)
   }
@@ -176,10 +174,8 @@ tail.Scanner <- function(x, n = 6L, ...) {
 }
 
 tail_from_batches <- function(batches, n) {
-  assert_is(n, c("numeric", "integer"))
-  assert_that(length(n) == 1)
   # Negative n requires knowing nrow(x), which requires a scan itself
-  assert_that(n >= 0)
+  check_number_decimal(n, min = 0)
   if (!is.integer(n)) {
     n <- floor(n)
   }

r/R/dplyr.R

@@ -230,8 +230,7 @@ as.data.frame.arrow_dplyr_query <- function(x, row.names = NULL, optional = FALS
 
 #' @export
 head.arrow_dplyr_query <- function(x, n = 6L, ...) {
-  assert_is(n, c("numeric", "integer"))
-  assert_that(length(n) == 1)
+  check_number_decimal(n)
   if (!is.integer(n)) {
     n <- floor(n)
   }
@@ -241,8 +240,7 @@ head.arrow_dplyr_query <- function(x, n = 6L, ...) {
 
 #' @export
 tail.arrow_dplyr_query <- function(x, n = 6L, ...) {
-  assert_is(n, c("numeric", "integer"))
-  assert_that(length(n) == 1)
+  check_number_decimal(n)
   if (!is.integer(n)) {
     n <- floor(n)
   }

r/R/record-batch-reader.R

@@ -134,10 +134,8 @@ as.data.frame.RecordBatchReader <- function(x, row.names = NULL, optional = FALS
 
 #' @export
 head.RecordBatchReader <- function(x, n = 6L, ...) {
-  assert_is(n, c("numeric", "integer"))
-  assert_that(length(n) == 1)
   # Negative n requires knowing nrow(x), which requires consuming the whole RBR
-  assert_that(n >= 0)
+  check_number_decimal(n, min = 0)
   if (!is.integer(n)) {
     n <- floor(n)
   }