Replace simple uses of succeed() + invisible()

Author: hadley

R/expect-comparison.R

@@ -44,8 +44,7 @@ expect_compare <- function(operator = c("<", "<=", ">", ">="), act, exp) {
     )
     fail(msg, trace_env = caller_env())
   }
-  succeed()
-  invisible(act$val)
+  pass(act$val)
 }
 #' @export
 #' @rdname comparison-expectations

R/expect-condition.R

@@ -141,8 +141,7 @@ expect_error <- function(
     if (!is.null(msg)) {
       fail(msg, info = info, trace = act$cap[["trace"]])
     }
-    succeed()
-    invisible(act$val %||% act$cap)
+    pass(act$val %||% act$cap)
   }
 }
 
@@ -192,9 +191,7 @@ expect_warning <- function(
     if (!is.null(msg)) {
       fail(msg, info = info)
     }
-    succeed()
-
-    invisible(act$val)
+    pass(act$val)
   }
 }
 
@@ -227,9 +224,7 @@ expect_message <- function(
     if (!is.null(msg)) {
       fail(msg, info = info)
     }
-    succeed()
-
-    invisible(act$val)
+    pass(act$val)
   }
 }
 
@@ -274,9 +269,7 @@ expect_condition <- function(
     if (!is.null(msg)) {
       fail(msg, info = info, trace = act$cap[["trace"]])
     }
-    succeed()
-
-    invisible(act$val %||% act$cap)
+    pass(act$val %||% act$cap)
   }
 }
 
@@ -317,11 +310,9 @@ expect_condition_matching <- function(
   if (!is.null(msg)) {
     fail(msg, info = info, trace = act$cap[["trace"]], trace_env = trace_env)
   }
-  succeed()
-
   # If a condition was expected, return it. Otherwise return the value
   # of the expression.
-  invisible(if (expected) act$cap else act$val)
+  pass(if (expected) act$cap else act$val)
 }
 
 # -------------------------------------------------------------------------

R/expect-equality.R

@@ -79,8 +79,7 @@ expect_equal <- function(
       msg <- sprintf("%s not equal to %s.\n%s", act$lab, exp$lab, comp$message)
       fail(msg, info = info)
     }
-    succeed()
-    invisible(act$val)
+    pass(act$val)
   }
 }
 
@@ -116,8 +115,7 @@ expect_identical <- function(
       msg <- sprintf("%s not identical to %s.\n%s", act$lab, exp$lab, msg)
       fail(msg, info = info)
     }
-    succeed()
-    invisible(act$val)
+    pass(act$val)
   }
 }
 
@@ -141,9 +139,7 @@ expect_waldo_equal <- function(type, act, exp, info, ...) {
     )
     fail(msg, info = info, trace_env = caller_env())
   }
-  succeed()
-
-  invisible(act$val)
+  pass(act$val)
 }
 
 #' Is an object equal to the expected value, ignoring attributes?
@@ -196,8 +192,7 @@ expect_equivalent <- function(
     )
     fail(msg, info = info)
   }
-  succeed()
-  invisible(act$val)
+  pass(act$val)
 }
 
 
@@ -233,8 +228,7 @@ expect_reference <- function(
     msg <- sprintf("%s not a reference to %s.", act$lab, exp$lab)
     fail(msg, info = info)
   }
-  succeed()
-  invisible(act$val)
+  pass(act$val)
 }
 
 # expect_reference() needs dev version of rlang

R/expect-inheritance.R

@@ -60,8 +60,7 @@ expect_type <- function(object, type) {
     )
     fail(msg)
   }
-  succeed()
-  invisible(act$val)
+  pass(act$val)
 }
 
 #' @export
@@ -102,8 +101,7 @@ expect_s3_class <- function(object, class, exact = FALSE) {
     abort("`class` must be a NA or a character vector")
   }
 
-  succeed()
-  invisible(act$val)
+  pass(act$val)
 }
 
 #' @export
@@ -212,8 +210,7 @@ expect_is <- function(object, class, info = NULL, label = NULL) {
     )
     fail(msg, info = info)
   }
-  succeed()
-  invisible(act$val)
+  pass(act$val)
 }
 
 

R/expect-invisible.R

@@ -28,8 +28,7 @@ expect_invisible <- function(call, label = NULL) {
     msg <- sprintf("%s returns visibly, not invisibly.", lab)
     fail(msg)
   }
-  succeed()
-  invisible(vis$value)
+  pass(vis$value)
 }
 
 #' @export
@@ -42,6 +41,5 @@ expect_visible <- function(call, label = NULL) {
     msg <- sprintf("%s returns invisibly, not visibly.", lab)
     fail(msg)
   }
-  succeed()
-  invisible(vis$value)
+  pass(vis$value)
 }

R/expect-length.R

@@ -27,7 +27,5 @@ expect_length_impl_ <- function(act, n) {
     msg <- sprintf("%s has length %i, not length %i.", act$lab, act$n, n)
     fail(msg, trace_env = parent.frame())
   }
-  succeed()
-
-  invisible(act$val)
+  pass(act$val)
 }

R/expect-named.R

@@ -54,8 +54,7 @@ expect_named <- function(
       fail(msg, info = info)
     }
   }
-  succeed()
-  invisible(act$val)
+  pass(act$val)
 }
 
 normalise_names <- function(x, ignore.order = FALSE, ignore.case = FALSE) {

R/expect-setequal.R

@@ -51,11 +51,8 @@ expect_setequal <- function(object, expected) {
         paste0("* Only in `expected`: ", values(exp_miss), "\n")
       }
     ))
-  } else {
-    succeed()
   }
-
-  invisible(act$val)
+  pass(act$val)
 }
 
 values <- function(x) {
@@ -89,8 +86,7 @@ expect_mapequal <- function(object, expected) {
   # Length-0 vectors are OK whether named or unnamed.
   if (length(act$val) == 0 && length(exp$val) == 0) {
     warn("`object` and `expected` are empty lists")
-    succeed()
-    return(invisible(act$val))
+    return(pass(act$val))
   }
 
   act_nms <- names(act$val)

R/expect-shape.R

@@ -83,6 +83,5 @@ expect_shape = function(object, ..., length, nrow, ncol, dim) {
     }
   }
 
-  succeed()
-  invisible(act$val)
+  pass(act$val)
 }

R/expect-silent.R

@@ -30,7 +30,5 @@ expect_silent <- function(object) {
     msg <- sprintf("%s produced %s.", act$lab, paste(outputs, collapse = ", "))
     fail(msg)
   }
-  succeed()
-
-  invisible(act$cap$result)
+  pass(act$cap$result)
 }