Merge pull request #281 from tidyverse/f-styler

chore: Apply styler
tidyverse · Oct 19, 2024 · a618f03 · a618f03
2 parents 2e1be7a + ec3d49e
commit a618f03
Show file tree

Hide file tree

Showing 70 changed files with 131 additions and 135 deletions.
diff --git a/R/add_count.R b/R/add_count.R
@@ -2,7 +2,7 @@
 #' @export
 add_count.duckplyr_df <- function(x, ..., wt = NULL, sort = FALSE, name = NULL, .drop = deprecated()) {
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     "No relational implementation for add_count()" = TRUE,
     {
       return(out)

diff --git a/R/anti_join.R b/R/anti_join.R
@@ -9,7 +9,8 @@ anti_join.duckplyr_df <- function(x, y, by = NULL, copy = FALSE, ..., na_matches
   na_matches <- check_na_matches(na_matches, error_call = error_call)
 
   # Our implementation
-  rel_try(call = list(name = "anti_join", x = x, y = y, args = list(by = if(!is.null(by) && !is_cross_by(by)) as_join_by(by), copy = copy, na_matches = na_matches)),
+  rel_try(list(name = "anti_join", x = x, y = y, args = list(by = if (!is.null(by) && !is_cross_by(by)) as_join_by(by), copy = copy, na_matches = na_matches)),
+    "No restrictions" = FALSE,
     {
       out <- rel_join_impl(x, y, by, "anti", na_matches, error_call = error_call)
       return(out)

diff --git a/R/arrange.R b/R/arrange.R
@@ -6,7 +6,7 @@ arrange.duckplyr_df <- function(.data, ..., .by_group = FALSE, .locale = NULL) {
   dots <- enquos(...)
   dots <- unname(dots)
 
-  rel_try(call = list(name = "arrange", x = .data, args = list(dots = dots, .by_group = .by_group)),
+  rel_try(list(name = "arrange", x = .data, args = list(dots = dots, .by_group = .by_group)),
     ".by_group = TRUE not supported" = !identical(.by_group, FALSE),
     ".locale argument not supported" = !is.null(.locale),
     "dplyr.legacy_locale not supported" = isTRUE(getOption("dplyr.legacy_locale")),
@@ -17,9 +17,9 @@ arrange.duckplyr_df <- function(.data, ..., .by_group = FALSE, .locale = NULL) {
         return(.data)
       }
 
-      dots_ascending  <- handle_desc(dots)
-      dots            <- dots_ascending$dots
-      ascending       <- dots_ascending$ascending
+      dots_ascending <- handle_desc(dots)
+      dots <- dots_ascending$dots
+      ascending <- dots_ascending$ascending
 
       exprs <- rel_translate_dots(dots, .data)
 

diff --git a/R/compute.R b/R/compute.R
@@ -2,7 +2,7 @@
 #' @export
 compute.duckplyr_df <- function(x, ...) {
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     "No relational implementation for compute()" = TRUE,
     {
       return(out)

diff --git a/R/construct_constant.R b/R/construct_constant.R
@@ -16,7 +16,9 @@ opts_relational_relexpr_constant <- function(constructor = c("relexpr_constant",
 
 .cstr_construct.relational_relexpr_constant <- function(x, ...) {
   opts <- list(...)$opts$relational_relexpr_constant %||% opts_relational_relexpr_constant()
-  if (is_corrupted_relational_relexpr_constant(x) || opts$constructor == "next") return(NextMethod())
+  if (is_corrupted_relational_relexpr_constant(x) || opts$constructor == "next") {
+    return(NextMethod())
+  }
   UseMethod(".cstr_construct.relational_relexpr_constant", structure(NA, class = opts$constructor))
 }
 

diff --git a/R/construct_function.R b/R/construct_function.R
@@ -21,7 +21,9 @@ opts_relational_relexpr_function <- function(constructor = c("relexpr_function",
 .cstr_construct.relational_relexpr_function <- function(x, ...) {
   # There is probably no need for you to modify this function at all
   opts <- list(...)$opts$relational_relexpr_function %||% opts_relational_relexpr_function()
-  if (is_corrupted_relational_relexpr_function(x) || opts$constructor == "next") return(NextMethod())
+  if (is_corrupted_relational_relexpr_function(x) || opts$constructor == "next") {
+    return(NextMethod())
+  }
   # This odd looking code dispatches to a method based on the name of
   # the constructor rather than the class
   UseMethod(".cstr_construct.relational_relexpr_function", structure(NA, class = opts$constructor))

diff --git a/R/construct_reference.R b/R/construct_reference.R
@@ -16,7 +16,9 @@ opts_relational_relexpr_reference <- function(constructor = c("relexpr_reference
 
 .cstr_construct.relational_relexpr_reference <- function(x, ...) {
   opts <- list(...)$opts$relational_relexpr_reference %||% opts_relational_relexpr_reference()
-  if (is_corrupted_relational_relexpr_reference(x) || opts$constructor == "next") return(NextMethod())
+  if (is_corrupted_relational_relexpr_reference(x) || opts$constructor == "next") {
+    return(NextMethod())
+  }
   UseMethod(".cstr_construct.relational_relexpr_reference", structure(NA, class = opts$constructor))
 }
 

diff --git a/R/construct_window.R b/R/construct_window.R
@@ -16,7 +16,9 @@ opts_relational_relexpr_window <- function(constructor = c("relexpr_window", "ne
 
 .cstr_construct.relational_relexpr_window <- function(x, ...) {
   opts <- list(...)$opts$relational_relexpr_window %||% opts_relational_relexpr_window()
-  if (is_corrupted_relational_relexpr_window(x) || opts$constructor == "next") return(NextMethod())
+  if (is_corrupted_relational_relexpr_window(x) || opts$constructor == "next") {
+    return(NextMethod())
+  }
   UseMethod(".cstr_construct.relational_relexpr_window", structure(NA, class = opts$constructor))
 }
 

diff --git a/R/count.R b/R/count.R
@@ -17,7 +17,7 @@ count.duckplyr_df <- function(x, ..., wt = NULL, sort = FALSE, name = NULL, .dro
 
   n <- tally_n(x, {{ wt }})
 
-  rel_try(call = list(name = "count", x = x, args = list(dots = enquos(...), wt = enquo(wt), sort = sort, name = if (!name_was_null) sym(name), .drop = .drop)),
+  rel_try(list(name = "count", x = x, args = list(dots = enquos(...), wt = enquo(wt), sort = sort, name = if (!name_was_null) sym(name), .drop = .drop)),
     "count() needs all(is_name)" = !all(is_name),
     "count() only implemented for .drop = TRUE" = !.drop,
     "count() only implemented for sort = FALSE" = sort,

diff --git a/R/cross_join.R b/R/cross_join.R
@@ -2,7 +2,7 @@
 #' @export
 cross_join.duckplyr_df <- function(x, y, ..., copy = FALSE, suffix = c(".x", ".y")) {
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     "No relational implementation for cross_join()" = TRUE,
     {
       return(out)

diff --git a/R/distinct.R b/R/distinct.R
@@ -6,7 +6,7 @@ distinct.duckplyr_df <- function(.data, ..., .keep_all = FALSE) {
   dots <- enquos(..., .named = TRUE)
 
   # Our implementation
-  rel_try(call = list(name = "distinct", x = .data, args = list(dots = dots, .keep_all = .keep_all)),
+  rel_try(list(name = "distinct", x = .data, args = list(dots = dots, .keep_all = .keep_all)),
     "Implemented for all cases?" = FALSE,
     {
       # FIXME: avoid column duplication in a cleaner way

diff --git a/R/do.R b/R/do.R
@@ -2,7 +2,7 @@
 #' @export
 do.duckplyr_df <- function(.data, ...) {
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     "No relational implementation for do()" = TRUE,
     {
       return(out)

diff --git a/R/explain.R b/R/explain.R
@@ -1,10 +1,13 @@
 #' @export
 explain.duckplyr_df <- function(x, ...) {
-  rel_try({
-    rel <- duckdb_rel_from_df(x)
-    rel_explain(rel)
-    return(invisible())
-  })
+  rel_try(list(name = "explain", x = x),
+    "No restrictions" = FALSE,
+    {
+      rel <- duckdb_rel_from_df(x)
+      rel_explain(rel)
+      return(invisible())
+    }
+  )
 
   writeLines("Can't convert to relational, fallback implementation will be used.")
   invisible()

diff --git a/R/fallback.R b/R/fallback.R
@@ -71,7 +71,7 @@ fallback_sitrep <- function() {
 
   msg <- c(
     fallback_txt_header(),
-
+    #
     if (is.na(fallback_logging)) {
       c("i" = "Fallback logging is not controlled and therefore disabled. Enable it with {.run Sys.setenv(DUCKPLYR_FALLBACK_COLLECT = 1)}, disable it with {.run Sys.setenv(DUCKPLYR_FALLBACK_COLLECT = 0)}.")
     } else if (fallback_logging) {
@@ -89,15 +89,15 @@ fallback_sitrep <- function() {
     } else {
       c("x" = "Fallback logging is disabled.")
     },
-
+    #
     fallback_txt_uploading(fallback_uploading),
-
+    #
     if (isTRUE(fallback_logging)) {
       fallback_txt_sitrep_logs(fallback_logs)
     },
-
+    #
     fallback_txt_help(),
-
+    #
     NULL
   )
 

diff --git a/R/filter.R b/R/filter.R
@@ -8,7 +8,7 @@ filter.duckplyr_df <- function(.data, ..., .by = NULL, .preserve = FALSE) {
 
   by <- enquo(.by)
 
-  rel_try(call = list(name = "filter", x = .data, args = list(dots = dots, by = by, preserve = .preserve)),
+  rel_try(list(name = "filter", x = .data, args = list(dots = dots, by = by, preserve = .preserve)),
     "Can't use relational with zero-column result set." = (length(.data) == 0),
     "Can't use relational without filter conditions." = (length(dots) == 0),
     "Can't use relational with grouped operation." = (!quo_is_null(by)), # (length(by$names) > 0),

diff --git a/R/full_join.R b/R/full_join.R
@@ -6,7 +6,7 @@ full_join.duckplyr_df <- function(x, y, by = NULL, copy = FALSE, suffix = c(".x"
   y <- auto_copy(x, y, copy = copy)
 
   # Our implementation
-  rel_try(call = list(name = "full_join", x = x, y = y, args = list(by = if(!is.null(by) && !is_cross_by(by)) as_join_by(by), copy = copy, keep = keep, na_matches = na_matches, multiple = multiple, relationship = relationship)),
+  rel_try(list(name = "full_join", x = x, y = y, args = list(by = if (!is.null(by) && !is_cross_by(by)) as_join_by(by), copy = copy, keep = keep, na_matches = na_matches, multiple = multiple, relationship = relationship)),
     "No implicit cross joins for full_join()" = is_cross_by(by),
     {
       out <- rel_join_impl(x, y, by, "full", na_matches, suffix, keep, error_call)

diff --git a/R/group_by.R b/R/group_by.R
@@ -2,7 +2,7 @@
 #' @export
 group_by.duckplyr_df <- function(.data, ..., .add = FALSE, .drop = group_by_drop_default(.data)) {
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     # Always fall back to dplyr
     "No relational implementation for group_by()" = TRUE,
     {

diff --git a/R/group_indices.R b/R/group_indices.R
@@ -2,7 +2,7 @@
 #' @export
 group_indices.duckplyr_df <- function(.data, ...) {
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     # Always fall back to dplyr
     "No relational implementation for group_indices()" = TRUE,
     {

diff --git a/R/group_keys.R b/R/group_keys.R
@@ -2,7 +2,7 @@
 #' @export
 group_keys.duckplyr_df <- function(.tbl, ...) {
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     # Always fall back to dplyr
     "No relational implementation for group_keys()" = TRUE,
     {

diff --git a/R/group_map.R b/R/group_map.R
@@ -7,7 +7,7 @@ group_map.duckplyr_df <- function(.data, .f, ..., .keep = FALSE, keep = deprecat
   }
 
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     # Always fall back to dplyr
     "No relational implementation for group_map()" = TRUE,
     {
@@ -33,7 +33,7 @@ group_map.duckplyr_df <- function(.data, .f, ..., .keep = FALSE, keep = deprecat
   } else {
     group_split(.data)
   }
-  keys  <- group_keys(.data)
+  keys <- group_keys(.data)
   group_keys <- map(seq_len(nrow(keys)), function(i) keys[i, , drop = FALSE])
 
   if (length(chunks)) {

diff --git a/R/group_modify.R b/R/group_modify.R
@@ -7,7 +7,7 @@ group_modify.duckplyr_df <- function(.data, .f, ..., .keep = FALSE, keep = depre
   }
 
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     # Always fall back to dplyr
     "No relational implementation for group_modify()" = TRUE,
     {

diff --git a/R/group_nest.R b/R/group_nest.R
@@ -2,7 +2,7 @@
 #' @export
 group_nest.duckplyr_df <- function(.tbl, ..., .key = "data", keep = FALSE) {
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     # Always fall back to dplyr
     "No relational implementation for group_nest()" = TRUE,
     {

diff --git a/R/group_size.R b/R/group_size.R
@@ -2,7 +2,7 @@
 #' @export
 group_size.duckplyr_df <- function(x) {
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     # Always fall back to dplyr
     "No relational implementation for group_size()" = TRUE,
     {

diff --git a/R/group_split.R b/R/group_split.R
@@ -7,7 +7,7 @@ group_split.duckplyr_df <- function(.tbl, ..., .keep = TRUE, keep = deprecated()
   }
 
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     # Always fall back to dplyr
     "No relational implementation for group_split()" = TRUE,
     {

diff --git a/R/group_trim.R b/R/group_trim.R
@@ -2,7 +2,7 @@
 #' @export
 group_trim.duckplyr_df <- function(.tbl, .drop = group_by_drop_default(.tbl)) {
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     # Always fall back to dplyr
     "No relational implementation for group_trim()" = TRUE,
     {

diff --git a/R/groups.R b/R/groups.R
@@ -2,7 +2,7 @@
 #' @export
 groups.duckplyr_df <- function(x) {
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     # Always fall back to dplyr
     "No relational implementation for groups()" = TRUE,
     {

diff --git a/R/handle_desc.R b/R/handle_desc.R
@@ -8,15 +8,15 @@ handle_desc <- function(dots) {
   for (i in seq_along(dots)) {
     expr <- quo_get_expr(dots[[i]])
 
-    if (!is.call(expr))       next
-    if (expr[[1]] != "desc")  next
+    if (!is.call(expr)) next
+    if (expr[[1]] != "desc") next
 
     # Check that desc is called with a single argument
     # (dplyr::desc() accepts only one argument)
     if (length(expr) > 2) cli::cli_abort("`desc()` must be called with exactly one argument.")
 
     ascending[i] <- FALSE
-    dots[[i]]    <- new_quosure(expr[[2]], env = quo_get_env(dots[[i]]))
+    dots[[i]] <- new_quosure(expr[[2]], env = quo_get_env(dots[[i]]))
   }
 
   list(dots = dots, ascending = ascending)

diff --git a/R/head.R b/R/head.R
@@ -2,7 +2,7 @@
 head.duckplyr_df <- function(x, n = 6L, ...) {
   stopifnot(is_integerish(n))
 
-  rel_try(call = list(name = "head", x = x, args = list(n = n)),
+  rel_try(list(name = "head", x = x, args = list(n = n)),
     "Can't process negative n" = (n < 0),
     {
       rel <- duckdb_rel_from_df(x)

diff --git a/R/inner_join.R b/R/inner_join.R
@@ -6,7 +6,7 @@ inner_join.duckplyr_df <- function(x, y, by = NULL, copy = FALSE, suffix = c(".x
   y <- auto_copy(x, y, copy = copy)
 
   # Our implementation
-  rel_try(call = list(name = "inner_join", x = x, y = y, args = list(by = if(!is.null(by) && !is_cross_by(by)) as_join_by(by), copy = copy, keep = keep, na_matches = na_matches, multiple = multiple, unmatched = unmatched, relationship = relationship)),
+  rel_try(list(name = "inner_join", x = x, y = y, args = list(by = if (!is.null(by) && !is_cross_by(by)) as_join_by(by), copy = copy, keep = keep, na_matches = na_matches, multiple = multiple, unmatched = unmatched, relationship = relationship)),
     "No implicit cross joins for inner_join()" = is_cross_by(by),
     {
       out <- rel_join_impl(x, y, by, "inner", na_matches, suffix, keep, error_call)

diff --git a/R/intersect.R b/R/intersect.R
@@ -12,7 +12,7 @@ intersect.duckplyr_df <- function(x, y, ...) {
     y_names <- x_names
   }
 
-  rel_try(call = list(name = "intersect", x = x, y = y),
+  rel_try(list(name = "intersect", x = x, y = y),
     "No duplicate names" = !identical(x_names, y_names) && anyDuplicated(x_names) && anyDuplicated(y_names),
     "Tables of different width" = length(x_names) != length(y_names),
     "Name mismatch" = !identical(x_names, y_names) && !all(y_names %in% x_names),

diff --git a/R/join.R b/R/join.R
@@ -1,12 +1,12 @@
 rel_join_impl <- function(
-    x,
-    y,
-    by,
-    join,
-    na_matches,
-    suffix = c(".x", ".y"),
-    keep = NULL,
-    error_call = caller_env()
+  x,
+  y,
+  by,
+  join,
+  na_matches,
+  suffix = c(".x", ".y"),
+  keep = NULL,
+  error_call = caller_env()
 ) {
   mutating <- !(join %in% c("semi", "anti"))
 

diff --git a/R/left_join.R b/R/left_join.R
@@ -6,7 +6,7 @@ left_join.duckplyr_df <- function(x, y, by = NULL, copy = FALSE, suffix = c(".x"
   y <- auto_copy(x, y, copy = copy)
 
   # Our implementation
-  rel_try(call = list(name = "left_join", x = x, y = y, args = list(by = if(!is.null(by) && !is_cross_by(by)) as_join_by(by), copy = copy, keep = keep, na_matches = na_matches, multiple = multiple, unmatched = unmatched, relationship = relationship)),
+  rel_try(list(name = "left_join", x = x, y = y, args = list(by = if (!is.null(by) && !is_cross_by(by)) as_join_by(by), copy = copy, keep = keep, na_matches = na_matches, multiple = multiple, unmatched = unmatched, relationship = relationship)),
     "No implicit cross joins for left_join()" = is_cross_by(by),
     {
       out <- rel_join_impl(x, y, by, "left", na_matches, suffix, keep, error_call)

diff --git a/R/mutate.R b/R/mutate.R
@@ -7,7 +7,7 @@ mutate.duckplyr_df <- function(.data, ..., .by = NULL, .keep = c("all", "used",
   by_names <- eval_select_by(by_arg, .data)
 
   # Our implementation
-  rel_try(call = list(name = "mutate", x = .data, args = list(dots = enquos(...), .by = by_arg, .keep = .keep)),
+  rel_try(list(name = "mutate", x = .data, args = list(dots = enquos(...), .by = by_arg, .keep = .keep)),
     "Implemented for all cases?" = FALSE,
     {
       rel <- duckdb_rel_from_df(.data)

diff --git a/R/n_groups.R b/R/n_groups.R
@@ -2,7 +2,7 @@
 #' @export
 n_groups.duckplyr_df <- function(x) {
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     # Always fall back to dplyr
     "No relational implementation for n_groups()" = TRUE,
     {

diff --git a/R/nest_by.R b/R/nest_by.R
@@ -2,7 +2,7 @@
 #' @export
 nest_by.duckplyr_df <- function(.data, ..., .key = "data", .keep = FALSE) {
   # Our implementation
-  rel_try(
+  rel_try(NULL,
     "No relational implementation for nest_by()" = TRUE,
     {
       return(out)