From 5d0c63d1a76d6cda5e135d73b60384f15c20e2d2 Mon Sep 17 00:00:00 2001
From: DavisVaughan <davis@rstudio.com>
Date: Mon, 11 Jul 2022 13:58:09 -0400
Subject: [PATCH] Use more appropriate `NULL` handling for `unique_ind`

---
 NAMESPACE           | 1 +
 R/rsample-package.R | 2 +-
 R/tidy.R            | 5 +----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/NAMESPACE b/NAMESPACE
index 1c7de961..3b5ceacd 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -338,6 +338,7 @@ importFrom(purrr,map_dfr)
 importFrom(purrr,map_lgl)
 importFrom(purrr,pluck)
 importFrom(rlang,"!!")
+importFrom(rlang,"%||%")
 importFrom(rlang,.data)
 importFrom(rlang,abort)
 importFrom(rlang,enquo)
diff --git a/R/rsample-package.R b/R/rsample-package.R
index 5d9a01df..dbc9eb59 100644
--- a/R/rsample-package.R
+++ b/R/rsample-package.R
@@ -15,7 +15,7 @@ NULL
 #' @importFrom dplyr select %>% bind_cols bind_rows arrange_ arrange full_join
 #' @importFrom dplyr mutate last ungroup group_by inner_join summarize do case_when
 #' @importFrom vctrs vec_unique_count vec_count vec_slice vec_in
-#' @importFrom rlang !! is_call is_string enquo quos exec is_list abort warn .data
+#' @importFrom rlang !! is_call is_string enquo quos exec is_list abort warn .data %||%
 #' @importFrom methods formalArgs
 #' @importFrom stats quantile setNames qnorm pnorm
 #' @importFrom tidyselect vars_select one_of
diff --git a/R/tidy.R b/R/tidy.R
index c5768bca..c9de48ab 100644
--- a/R/tidy.R
+++ b/R/tidy.R
@@ -74,10 +74,7 @@ tidy.rsplit <- function(x, unique_ind = TRUE, ...) {
 #' @export
 tidy.rset <- function(x, ...) {
   dots <- list(...)
-  unique_ind <- dplyr::if_else(is.null(dots$unique_ind),
-    TRUE,
-    dots$unique_ind
-  )
+  unique_ind <- dots$unique_ind %||% TRUE
   stacked <- purrr::map(x$splits, tidy, unique_ind = unique_ind)
   for (i in seq_along(stacked)) {
     stacked[[i]]$Resample <- x$id[i]