Switch if_else() to vec_if_else() (#7723)

* Switch `if_else()` to `vec_if_else()`

* NEWS bullet

* Regenerate snapshots with r-lib/vctrs#2049

* NEWS bullet about `condition`

Author: DavisVaughan

DESCRIPTION

@@ -34,7 +34,7 @@ Imports:
     tibble (>= 3.2.0),
     tidyselect (>= 1.2.0),
     utils,
-    vctrs (>= 0.6.4)
+    vctrs (>= 0.6.5.9000)
 Suggests:
     bench,
     broom,
@@ -66,3 +66,5 @@ Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.3.3
+Remotes:
+    r-lib/vctrs

NEWS.md

@@ -1,5 +1,9 @@
 # dplyr (development version)
 
+* `if_else()` no longer allows `condition` to be a logical array. It must be a logical vector with no `dim` attribute (#7723).
+
+* `if_else()` has gotten significantly faster and uses much less memory due to a rewrite in C via `vctrs::vec_if_else()` (#7723).
+
 * Passing `size` to `if_else()` is now deprecated. The output size is always taken from the `condition` (#7722).
 
 * `bind_rows()` now replaces empty (or `NA`) element names in a list with its numeric index while preserving existing names (#7719, @Meghansaha).

R/if-else.R

@@ -35,6 +35,8 @@
 #' `FALSE`, the matching values from `false`, and where it is `NA`, the matching
 #' values from `missing`, if provided, otherwise a missing value will be used.
 #'
+#' @seealso [vctrs::vec_if_else()]
+#'
 #' @export
 #' @examples
 #' x <- c(-5:5, NA)
@@ -66,26 +68,12 @@ if_else <- function(
     lifecycle::deprecate_warn("1.2.0", "if_else(size = )")
   }
 
-  # Assert early since we `!` the `condition`
-  check_logical(condition)
-
-  conditions <- list(
+  vec_if_else(
     condition = condition,
-    !condition
-  )
-  values <- list(
     true = true,
-    false = false
-  )
-
-  vec_case_when(
-    conditions = conditions,
-    values = values,
-    conditions_arg = "",
-    values_arg = "",
-    default = missing,
-    default_arg = "missing",
+    false = false,
+    missing = missing,
     ptype = ptype,
-    call = current_env()
+    error_call = current_env()
   )
 }

man/if_else.Rd

@@ -22,29 +22,37 @@
       Error in `if_else()`:
       ! `condition` must be a logical vector, not an integer vector.
 
+# `condition` can't be an array (#7723)
+
+    Code
+      if_else(array(TRUE), 1, 2)
+    Condition
+      Error in `if_else()`:
+      ! `condition` must be a logical vector, not a logical vector.
+
 # `true`, `false`, and `missing` must recycle to the size of `condition`
 
     Code
       if_else(x < 2, bad, x)
     Condition
       Error in `if_else()`:
-      ! `true` must have size 3, not size 2.
+      ! Can't recycle `true` (size 2) to size 3.
 
 ---
 
     Code
       if_else(x < 2, x, bad)
     Condition
       Error in `if_else()`:
-      ! `false` must have size 3, not size 2.
+      ! Can't recycle `false` (size 2) to size 3.
 
 ---
 
     Code
       if_else(x < 2, x, x, missing = bad)
     Condition
       Error in `if_else()`:
-      ! `missing` must have size 3, not size 2.
+      ! Can't recycle `missing` (size 2) to size 3.
 
 # must have empty dots
 

tests/testthat/_snaps/if-else.md

@@ -74,6 +74,14 @@ test_that("`condition` must be logical (and isn't cast to logical!)", {
   })
 })
 
+test_that("`condition` can't be an array (#7723)", {
+  expect_snapshot(error = TRUE, {
+    # TODO: Error message will improve with
+    # https://github.com/r-lib/rlang/pull/1832
+    if_else(array(TRUE), 1, 2)
+  })
+})
+
 test_that("`true`, `false`, and `missing` must recycle to the size of `condition`", {
   x <- 1:3
   bad <- 1:2