Make code structure more parallel

hadley · hadley · commit 066ab5964a4c · 2025-07-28T09:16:23.000-05:00
diff --git a/R/expect-self-test.R b/R/expect-self-test.R
@@ -77,6 +77,7 @@ expect_failure <- function(expr, message = NULL, ...) {
     if (!is.null(message)) {
       return(expect_match(status$last_failure$message, message, ...))
     }
+    succeed()
   } else if (status$n_failure == 0) {
     fail("Expectation did not fail")
   } else if (status$n_failure > 1) {
@@ -89,7 +90,6 @@ expect_failure <- function(expr, message = NULL, ...) {
     ))
   }
 
-  succeed()
   invisible(NULL)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ expect_failure <- function(expr, message = NULL, ...) {`
`77`	`77`	`if (!is.null(message)) {`
`78`	`78`	`return(expect_match(status$last_failure$message, message, ...))`
`79`	`79`	`}`
	`80`	`+ succeed()`
`80`	`81`	`} else if (status$n_failure == 0) {`
`81`	`82`	`fail("Expectation did not fail")`
`82`	`83`	`} else if (status$n_failure > 1) {`
`@@ -89,7 +90,6 @@ expect_failure <- function(expr, message = NULL, ...) {`
`89`	`90`	`))`
`90`	`91`	`}`
`91`	`92`
`92`		`- succeed()`
`93`	`93`	`invisible(NULL)`
`94`	`94`	`}`
`95`	`95`