stopifnot() -> stop_if_not()

Author: HenrikBengtsson

R/make_progression_handler.R

@@ -252,7 +252,7 @@ make_progression_handler <- function(name, reporter = list(), handler = NULL, en
 
   if (is.null(handler)) {
     handler <- function(p) {
-      stopifnot(inherits(p, "progression"))
+      stop_if_not(inherits(p, "progression"))
 
       if (inherits(p, "control_progression")) {
         type <- p$type

R/progress.R

@@ -16,7 +16,7 @@ progress <- function(..., call = sys.call()) {
   args <- list(...)
   if (length(args) == 1L && inherits(args[[1L]], "condition")) {
     cond <- args[[1L]]
-    stopifnot(inherits(cond, "progression"))
+    stop_if_not(inherits(cond, "progression"))
   } else {
     cond <- progression(..., call = call)
   }

R/progress_aggregator.R

@@ -15,7 +15,7 @@ progress_aggregator <- function(progress) {
   max_steps <- environment(progress)$steps
 
   handler <- function(p) {
-    stopifnot(inherits(p, "progression"))
+    stop_if_not(inherits(p, "progression"))
     type <- p$type
     debug <- getOption("progressr.debug", FALSE)
     if (debug) {

R/progression.R

@@ -52,8 +52,8 @@ progression <- function(message = character(0L), amount = 1.0, step = NULL, time
   nargs <- length(args)
   if (nargs > 0L) {
     names <- names(args)
-    stopifnot(!is.null(names), all(nzchar(names)),
-              length(unique(names)) == nargs)
+    stop_if_not(!is.null(names), all(nzchar(names)),
+                length(unique(names)) == nargs)
   }
 
   structure(

R/with_progress.R

@@ -131,10 +131,11 @@ with_progress <- function(expr, handlers = progressr::handlers(), cleanup = TRUE
 
   for (kk in seq_along(handlers)) {
     handler <- handlers[[kk]]
-    stopifnot(is.function(handler))
+    stop_if_not(is.function(handler))
     if (!inherits(handler, "progression_handler")) {
       handler <- handler()
-      stopifnot(is.function(handler), inherits(handler, "progression_handler"))
+      stop_if_not(is.function(handler),
+                  inherits(handler, "progression_handler"))
       handlers[[kk]] <- handler
     }
   }