Merge pull request #1515 from tidyverse/f-deprecate-2

NAMESPACE

@@ -73,6 +73,7 @@ export(view)
 exportClasses(tbl_df)
 import(rlang)
 importFrom(lifecycle,deprecate_soft)
+importFrom(lifecycle,deprecate_stop)
 importFrom(lifecycle,deprecate_warn)
 importFrom(lifecycle,expect_deprecated)
 importFrom(magrittr,"%>%")

R/add.R

@@ -45,7 +45,7 @@ add_row <- function(.data, ..., .before = NULL, .after = NULL) {
   }
 
   if (!is.data.frame(.data)) {
-    deprecate_warn("2.1.1", "add_row(.data = 'must be a data frame')")
+    deprecate_stop("2.1.1", "add_row(.data = 'must be a data frame')")
   }
 
   if (dots_n(...) == 0L) {
@@ -127,14 +127,13 @@ rbind_at <- function(old, new, pos) {
 add_column <- function(.data, ..., .before = NULL, .after = NULL,
                        .name_repair = c("check_unique", "unique", "universal", "minimal")) {
   if (!is.data.frame(.data)) {
-    deprecate_warn("2.1.1", "add_column(.data = 'must be a data frame')")
+    deprecate_stop("2.1.1", "add_column(.data = 'must be a data frame')")
   }
 
   if (has_length(.data) && (!is_named(.data) || anyDuplicated(names2(.data))) && missing(.name_repair)) {
-    deprecate_warn("3.0.0", "add_column(.data = 'must have unique names')",
+    deprecate_stop("3.0.0", "add_column(.data = 'must have unique names')",
       details = 'Use `.name_repair = "minimal"`.'
     )
-    .name_repair <- "minimal"
   }
 
   df <- tibble(..., .name_repair = .name_repair)

R/as_tibble.R

@@ -70,7 +70,9 @@ as_tibble.data.frame <- function(x, validate = NULL, ...,
                                  .rows = NULL,
                                  .name_repair = c("check_unique", "unique", "universal", "minimal"),
                                  rownames = pkgconfig::get_config("tibble::rownames", NULL)) {
-  .name_repair <- compat_name_repair(.name_repair, validate, missing(.name_repair))
+  if (!is.null(validate)) {
+    deprecate_stop("2.0.0", "tibble::as_tibble(validate = )", "as_tibble(.name_repair =)")
+  }
 
   old_rownames <- raw_rownames(x)
   if (is.null(.rows)) {
@@ -98,7 +100,9 @@ as_tibble.data.frame <- function(x, validate = NULL, ...,
 #' @rdname as_tibble
 as_tibble.list <- function(x, validate = NULL, ..., .rows = NULL,
                            .name_repair = c("check_unique", "unique", "universal", "minimal")) {
-  .name_repair <- compat_name_repair(.name_repair, validate, missing(.name_repair))
+  if (!is.null(validate)) {
+    deprecate_stop("2.0.0", "tibble::as_tibble(validate = )", "as_tibble(.name_repair =)")
+  }
 
   lst_to_tibble(x, .rows, .name_repair, col_lengths(x))
 }
@@ -110,25 +114,6 @@ lst_to_tibble <- function(x, .rows, .name_repair, lengths = NULL, call = caller_
   recycle_columns(x, .rows, lengths)
 }
 
-compat_name_repair <- function(.name_repair, validate, .missing_name_repair) {
-  if (is.null(validate)) return(.name_repair)
-
-
-  if (!.missing_name_repair) {
-    name_repair <- .name_repair
-  } else if (isTRUE(validate)) {
-    name_repair <- "check_unique"
-  } else {
-    name_repair <- "minimal"
-  }
-
-  deprecate_soft("2.0.0", "tibble::as_tibble(validate = )", "as_tibble(.name_repair =)",
-    env = foreign_caller_env()
-  )
-
-  name_repair
-}
-
 check_valid_cols <- function(x, pos = NULL, call = caller_env()) {
   names_x <- names2(x)
 
@@ -259,7 +244,7 @@ as_tibble.table <- function(x, `_n` = "n", ..., n = `_n`, .name_repair = "check_
 #' @usage \method{as_tibble}{NULL}(x, ...)
 as_tibble.NULL <- function(x, ...) {
   if (missing(x)) {
-    deprecate_soft("3.0.0", "as_tibble(x = 'can\\'t be missing')")
+    deprecate_stop("3.0.0", "as_tibble(x = 'can\\'t be missing')")
   }
 
   new_tibble(list(), nrow = 0)

R/deprecated.R

@@ -33,23 +33,17 @@ tibble_ <- function(xs) {
 #' @export
 #' @rdname deprecated
 data_frame_ <- function(xs) {
-  deprecate_soft("2.0.0", "data_frame_()", "tibble()",
+  deprecate_stop("2.0.0", "data_frame_()", "tibble()",
     details = '`tibble()` supports dynamic dots, see `?"dyn-dots"`.'
   )
-
-  xs <- compat_lazy_dots(xs, caller_env())
-  tibble(!!!xs)
 }
 
 #' @export
 #' @rdname deprecated
 lst_ <- function(xs) {
-  deprecate_soft("2.0.0", "lst_()", "lst()",
+  deprecate_stop("2.0.0", "lst_()", "lst()",
     details = '`lst()` supports dynamic dots, see `?"dyn-dots"`.'
   )
-
-  xs <- compat_lazy_dots(xs, caller_env())
-  lst(!!!xs)
 }
 
 #' @description
@@ -81,9 +75,7 @@ as.tibble <- function(x, ...) {
 #' @export
 #' @rdname deprecated
 frame_data <- function(...) {
-  deprecate_soft("2.0.0", "frame_data()", "tribble()")
-
-  tribble(...)
+  deprecate_stop("2.0.0", "frame_data()", "tribble()")
 }
 
 #' Name repair

R/new.R

@@ -34,8 +34,7 @@
 new_tibble <- function(x, ..., nrow = NULL, class = NULL, subclass = NULL) {
   # For compatibility with tibble < 2.0.0
   if (is.null(class) && !is.null(subclass)) {
-    deprecate_soft("2.0.0", "tibble::new_tibble(subclass = )", "new_tibble(class = )")
-    class <- subclass
+    deprecate_stop("2.0.0", "tibble::new_tibble(subclass = )", "new_tibble(class = )")
   }
 
   #' @section Construction:

R/sub.R

@@ -200,12 +200,10 @@ NULL
 
 tbl_subset2 <- function(x, j, j_arg, call = caller_env()) {
   if (is.matrix(j)) {
-    deprecate_soft("3.0.0", "tibble::`[[.tbl_df`(j = 'can\\'t be a matrix",
+    deprecate_stop("3.0.0", "tibble::`[[.tbl_df`(j = 'can\\'t be a matrix')",
       details = "Recursive subsetting is deprecated for tibbles.",
       env = foreign_caller_env()
     )
-
-    return(as.matrix(x)[[j]])
   }
 
   if (is.object(j)) {
@@ -219,7 +217,7 @@ tbl_subset2 <- function(x, j, j_arg, call = caller_env()) {
         vectbl_as_col_location2(j, length(x), j_arg = j_arg, call = call)
       }
     } else if (length(j) == 2L) {
-      deprecate_soft("3.0.0", "tibble::`[[.tbl_df`(j = 'can\\'t be a vector of length 2')",
+      deprecate_stop("3.0.0", "tibble::`[[.tbl_df`(j = 'can\\'t be a vector of length 2')",
         details = "Recursive subsetting is deprecated for tibbles.",
         env = foreign_caller_env()
       )

R/tibble-package.R

@@ -1,6 +1,7 @@
 ## usethis namespace: start
 #' @importFrom lifecycle deprecate_soft
 #' @importFrom lifecycle deprecate_warn
+#' @importFrom lifecycle deprecate_stop
 #' @importFrom lifecycle expect_deprecated
 #' @importFrom pkgconfig set_config
 #' @importFrom utils head tail

revdep/cran.md

@@ -1,6 +1,6 @@
 ## revdepcheck results
 
-We checked 5 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
+We checked 3 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
 
  * We saw 2 new problems
  * We failed to check 0 packages

revdep/problems.md

@@ -6,7 +6,7 @@
 * GitHub: https://github.com/kiangkiangkiang/ggESDA
 * Source code: https://github.com/cran/ggESDA
 * Date/Publication: 2022-08-19 08:40:10 UTC
-* Number of recursive dependencies: 206
+* Number of recursive dependencies: 208
 
 Run `revdepcheck::cloud_details(, "ggESDA")` for more info
 
@@ -29,7 +29,7 @@ Run `revdepcheck::cloud_details(, "ggESDA")` for more info
     > data(Cardiological)
     > ggInterval_index(Cardiological, aes(x = Syst))
     Error in get(x, envir = ns, inherits = FALSE) : 
-      object 'tbl_subset_row' not found
+      object 'tbl_subset_col' not found
     Calls: ggInterval_index ... as.data.frame -> [ -> [.symbolic_tbl -> getFromNamespace -> get
     Execution halted
     ```
@@ -41,7 +41,7 @@ Run `revdepcheck::cloud_details(, "ggESDA")` for more info
     --- re-building ‘ggESDA.Rmd’ using rmarkdown
     Quitting from lines 47-57 (ggESDA.Rmd) 
     Error: processing vignette 'ggESDA.Rmd' failed with diagnostics:
-    object 'tbl_subset_row' not found
+    object 'tbl_subset_col' not found
     --- failed re-building ‘ggESDA.Rmd’
     
     SUMMARY: processing the following file failed:
@@ -82,7 +82,7 @@ Run `revdepcheck::cloud_details(, "RSDA")` for more info
     > data(abalone)
     > res <- sym.pca(abalone, 'centers')
     Error in get(x, envir = ns, inherits = FALSE) : 
-      object 'tbl_subset_row' not found
+      object 'tbl_subset_col' not found
     Calls: sym.pca ... %in% -> [ -> [.symbolic_tbl -> getFromNamespace -> get
     Execution halted
     ```
@@ -94,7 +94,7 @@ Run `revdepcheck::cloud_details(, "RSDA")` for more info
     --- re-building ‘introduction.Rmd’ using rmarkdown
     Quitting from lines 60-64 (introduction.Rmd) 
     Error: processing vignette 'introduction.Rmd' failed with diagnostics:
-    object 'tbl_subset_row' not found
+    object 'tbl_subset_col' not found
     --- failed re-building ‘introduction.Rmd’
     
     SUMMARY: processing the following file failed:

tests/testthat/_snaps/vignette-invariants/invariants.md

@@ -321,9 +321,9 @@ df[[1:2]]
 
 ```r
 tbl[[1:2]]
-#> Warning: The `j` argument of `[[.tbl_df` can't be a vector of length 2 as of tibble 3.0.0.
+#> Error:
+#> ! The `j` argument of `[[.tbl_df` can't be a vector of length 2 as of tibble 3.0.0.
 #> i Recursive subsetting is deprecated for tibbles.
-#> [1] NA
 ```
 
 </td></tr><tr style="vertical-align:top"><td>

tests/testthat/test-as_tibble.R

@@ -484,100 +484,70 @@ test_that("as_tibble_col() can convert atomic vectors to data frame", {
 test_that("`validate` triggers deprecation message, but then works", {
   scoped_lifecycle_warnings()
 
-  expect_tibble_abort(
-    expect_warning(
-      as_tibble(list(a = 1, "hi"), validate = TRUE),
-      "deprecated",
-      fixed = TRUE
-    ),
-    abort_column_names_cannot_be_empty(2, repair_hint = TRUE)
+  expect_error(
+    as_tibble(list(a = 1, "hi"), validate = TRUE)
   )
 
-  expect_warning(
-    df <- as_tibble(list(a = 1, "hi", a = 2), validate = FALSE),
+  expect_error(
+    as_tibble(list(a = 1, "hi", a = 2), validate = FALSE),
     "deprecated",
     fixed = TRUE
   )
-  expect_identical(names(df), c("a", "", "a"))
 
   df <- data.frame(a = 1, "hi", a = 2)
   names(df) <- c("a", "", "a")
-  expect_warning(
-    df <- as_tibble(df, validate = FALSE),
-    "deprecated",
-    fixed = TRUE
+  expect_error(
+    as_tibble(df, validate = FALSE)
   )
-  expect_identical(names(df), c("a", "", "a"))
 
   df <- data.frame(a = 1, "hi")
   names(df) <- c("a", "")
-  expect_tibble_abort(
-    expect_warning(
-      as_tibble(df, validate = TRUE),
-      "deprecated",
-      fixed = TRUE
-    ),
-    abort_column_names_cannot_be_empty(2, repair_hint = TRUE)
+  expect_error(
+    as_tibble(df, validate = TRUE)
   )
 })
 
 test_that("`validate` always raises lifecycle warning.", {
-  expect_deprecated(
-    expect_tibble_abort(
-      as_tibble(list(a = 1, "hi"), validate = TRUE, .name_repair = "check_unique"),
-      abort_column_names_cannot_be_empty(2, repair_hint = TRUE)
-    )
+  expect_error(
+    as_tibble(list(a = 1, "hi"), validate = TRUE, .name_repair = "check_unique")
   )
 
-  expect_deprecated(
-    df <- as_tibble(list(a = 1, "hi", a = 2), validate = FALSE, .name_repair = "minimal")
+  expect_error(
+    as_tibble(list(a = 1, "hi", a = 2), validate = FALSE, .name_repair = "minimal")
   )
-  expect_identical(names(df), c("a", "", "a"))
 
   df <- data.frame(a = 1, "hi", a = 2)
   names(df) <- c("a", "", "a")
-  expect_deprecated(
-    df <- as_tibble(df, validate = FALSE, .name_repair = "minimal")
+  expect_error(
+    as_tibble(df, validate = FALSE, .name_repair = "minimal")
   )
-  expect_identical(names(df), c("a", "", "a"))
 
   df <- data.frame(a = 1, "hi")
   names(df) <- c("a", "")
-  expect_tibble_abort(
-    expect_deprecated(
-      as_tibble(df, validate = TRUE, .name_repair = "check_unique")
-    ),
-    abort_column_names_cannot_be_empty(2, repair_hint = TRUE)
+  expect_error(
+    as_tibble(df, validate = TRUE, .name_repair = "check_unique")
   )
 })
 
 test_that("Inconsistent `validate` and `.name_repair` used together raise a warning.", {
-  expect_deprecated(
-    expect_tibble_abort(
-      as_tibble(list(a = 1, "hi"), validate = FALSE, .name_repair = "check_unique"),
-      abort_column_names_cannot_be_empty(2, repair_hint = TRUE)
-    )
+  expect_error(
+    as_tibble(list(a = 1, "hi"), validate = FALSE, .name_repair = "check_unique")
   )
 
-  expect_deprecated(
-    df <- as_tibble(list(a = 1, "hi", a = 2), validate = TRUE, .name_repair = "minimal")
+  expect_error(
+    as_tibble(list(a = 1, "hi", a = 2), validate = TRUE, .name_repair = "minimal")
   )
-  expect_identical(names(df), c("a", "", "a"))
 
   df <- data.frame(a = 1, "hi", a = 2)
   names(df) <- c("a", "", "a")
-  expect_deprecated(
-    df <- as_tibble(df, validate = TRUE, .name_repair = "minimal")
+  expect_error(
+    as_tibble(df, validate = TRUE, .name_repair = "minimal")
   )
-  expect_identical(names(df), c("a", "", "a"))
 
   df <- data.frame(a = 1, "hi")
   names(df) <- c("a", "")
-  expect_deprecated(
-    expect_tibble_abort(
-      as_tibble(df, validate = FALSE, .name_repair = "check_unique"),
-      abort_column_names_cannot_be_empty(2, repair_hint = TRUE)
-    )
+  expect_error(
+    as_tibble(df, validate = FALSE, .name_repair = "check_unique")
   )
 })
 

tests/testthat/test-new.R

@@ -1,29 +1,3 @@
-test_that("new_tibble() with deprecated subclass argument", {
-  scoped_lifecycle_silence()
-
-  tbl <- new_tibble(
-    data.frame(a = 1:3),
-    names = "b",
-    attr1 = "value1",
-    attr2 = 2,
-    nrow = 3,
-    subclass = "nt"
-  )
-
-  # Can't compare directly due to dplyr:::all.equal.tbl_df()
-  expect_identical(class(tbl), c("nt", "tbl_df", "tbl", "data.frame"))
-  expect_equal(
-    unclass(tbl),
-    structure(
-      list(b = 1:3),
-      attr1 = "value1",
-      attr2 = 2,
-      .Names = "b",
-      row.names = .set_row_names(3L)
-    )
-  )
-})
-
 test_that("new_tibble() with new class argument", {
   tbl <- new_tibble(
     data.frame(a = 1:3),