use try instead of tryCatch (#237)

easystats · Aug 30, 2022 · 20c12de · 20c12de
1 parent cc44ae3
commit 20c12de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/R/data_match.R b/R/data_match.R
@@ -165,11 +165,11 @@ data_filter <- function(x, filter, ...) {
     if (is.character(condition)) {
       condition <- .str2lang(condition)
     }
-    out <- tryCatch(
-      do.call(subset, list(x, subset = condition)),
-      warning = function(e) NULL,
-      error = function(e) NULL
-    )
+    out <- try(do.call(subset, list(x, subset = condition)), silent = TRUE)
+    if (inherits(out, "try-error")) {
+      out <- NULL
+    }
+
     # any errors? Give more informative message to users
     # about possible misspelled comparisons / logical conditions
     if (is.null(out)) {

diff --git a/tests/testthat/test-data_match.R b/tests/testthat/test-data_match.R
@@ -80,7 +80,6 @@ test_that("data_filter works like slice", {
 })
 
 test_that("data_filter gives informative message on errors", {
-  data(mtcars)
   expect_error(
     data_filter(mtcars, "mpg > 10 || cyl = 4"),
     "`==`"