Make stop_incompatible_* functions with one arg

Author: juliasilge

R/aaa_models.R

@@ -134,20 +134,21 @@ check_mode_val <- function(mode) {
 }
 
 
-glue_compatible_modes <- function(cls, spec_modes) {
-  glue::glue(
+stop_incompatible_mode <- function(spec_modes) {
+  msg <- glue::glue(
     "Available modes are: ",
     glue::glue_collapse(glue::glue("'{spec_modes}'"), sep = ", ")
   )
+  rlang::abort(msg)
 }
 
 # check if class and mode are compatible
 check_spec_mode_val <- function(cls, mode) {
   spec_modes <- rlang::env_get(get_model_env(), paste0(cls, "_modes"))
   if (is.null(mode) || length(mode) > 1) {
-    rlang::abort(glue_compatible_modes(cls, spec_modes))
+    stop_incompatible_mode(spec_modes)
   } else if (!(mode %in% spec_modes)) {
-    rlang::abort(glue_compatible_modes(cls, spec_modes))
+    stop_incompatible_mode(spec_modes)
   }
   invisible(NULL)
 }

R/arguments.R

@@ -79,7 +79,7 @@ set_mode <- function(object, mode) {
   cls <- class(object)[1]
   if (rlang::is_missing(mode)) {
     spec_modes <- rlang::env_get(get_model_env(), paste0(cls, "_modes"))
-    rlang::abort(glue_compatible_modes(cls, spec_modes))
+    stop_incompatible_mode(spec_modes)
   }
   check_spec_mode_val(cls, mode)
   object$mode <- mode

R/engines.R

@@ -10,20 +10,21 @@ possible_engines <- function(object, ...) {
   unique(engs$engine)
 }
 
-glue_compatible_engines <- function(engine, avail_eng) {
-  glue::glue(
+stop_incompatible_engine <- function(avail_eng) {
+  msg <- glue::glue(
     "Available engines are: ",
     glue::glue_collapse(glue::glue("'{avail_eng}'"), sep = ", ")
   )
+  rlang::abort(msg)
 }
 
 check_engine <- function(object) {
   avail_eng <- possible_engines(object)
   eng <- object$engine
   if (is.null(eng) || length(eng) > 1) {
-    rlang::abort(glue_compatible_engines(eng, avail_eng))
+    stop_incompatible_engine(avail_eng)
   } else if (!(eng %in% avail_eng)) {
-    rlang::abort(glue_compatible_engines(eng, avail_eng))
+    stop_incompatible_engine(avail_eng)
   }
   object
 }
@@ -95,7 +96,7 @@ set_engine <- function(object, engine, ...) {
 
   if (rlang::is_missing(engine)) {
     avail_eng <- possible_engines(object)
-    rlang::abort(glue_compatible_engines(object$engine, avail_eng))
+    stop_incompatible_engine(avail_eng)
   }
   object$engine <- engine
   object <- check_engine(object)