use structure to return list with class instead of class(res)<-... and then return res

Author: averissimo

R/choices_labeled.R

@@ -217,7 +217,7 @@ variable_choices.data.frame <- function(data, subset = NULL, fill = TRUE, key =
     subset <- unique(subset)
   }
 
-  res <- if ("" %in% subset) {
+  if ("" %in% subset) {
     choices_labeled(
       choices = c("", names(data)),
       labels = c("", unname(teal.data::col_labels(data, fill = fill))),
@@ -232,8 +232,6 @@ variable_choices.data.frame <- function(data, subset = NULL, fill = TRUE, key =
       types = var_types
     )
   }
-
-  res
 }
 
 #' Wrapper on [choices_labeled] to label variable values basing on other variable values

R/choices_selected.R

@@ -139,11 +139,12 @@ choices_selected <- function(choices,
   }
 
   if (inherits(choices, "delayed_data")) {
-    out <- structure(
-      list(choices = choices, selected = selected, keep_order = keep_order, fixed = fixed),
-      class = c("delayed_choices_selected", "delayed_data", "choices_selected")
+    return(
+      structure(
+        list(choices = choices, selected = selected, keep_order = keep_order, fixed = fixed),
+        class = c("delayed_choices_selected", "delayed_data", "choices_selected")
+      )
     )
-    return(out)
   }
 
   if (!is.null(choices) && no_select_keyword %in% choices) {

R/filter_spec.R

@@ -409,23 +409,23 @@ filter_spec_internal.default <- function(vars_choices,
     checkmate::assert_subset(selected, choices)
   }
 
-  res <- list(
-    vars_choices = vars_choices,
-    vars_selected = vars_selected,
-    vars_label = vars_label,
-    vars_fixed = vars_fixed,
-    vars_multiple = vars_multiple,
-    choices = choices,
-    selected = selected,
-    label = label,
-    multiple = multiple,
-    fixed = fixed,
-    sep = sep,
-    drop_keys = drop_keys,
-    dataname = dataname, # modified by data_extract_spec
-    initialized = initialized
+  structure(
+    list(
+      vars_choices = vars_choices,
+      vars_selected = vars_selected,
+      vars_label = vars_label,
+      vars_fixed = vars_fixed,
+      vars_multiple = vars_multiple,
+      choices = choices,
+      selected = selected,
+      label = label,
+      multiple = multiple,
+      fixed = fixed,
+      sep = sep,
+      drop_keys = drop_keys,
+      dataname = dataname, # modified by data_extract_spec
+      initialized = initialized
+    ),
+    class = "filter_spec"
   )
-  class(res) <- "filter_spec"
-
-  res
 }

R/get_dplyr_call.R

@@ -637,12 +637,10 @@ get_reshape_unite_vals <- function(selector) {
   )
   unite_cols_vals <- unite_cols_vals[vapply(unite_cols_vals, length, integer(1)) > 0]
 
-  res <- if (length(unite_cols_vals) > 0) {
+  if (length(unite_cols_vals) > 0) {
     grid <- do.call(expand.grid, args = list(unite_cols_vals, stringsAsFactors = FALSE))
     apply(grid, 1, paste, collapse = "_")
   } else {
     character(0)
   }
-
-  res
 }

R/select_spec.R

@@ -173,11 +173,11 @@ select_spec.default <- function(choices, # nolint
     }
   }
 
-  res <- list(
-    choices = choices, selected = selected, multiple = multiple, fixed = fixed,
-    always_selected = always_selected, ordered = ordered, label = label
+  structure(
+    list(
+      choices = choices, selected = selected, multiple = multiple, fixed = fixed,
+      always_selected = always_selected, ordered = ordered, label = label
+    ),
+    class = "select_spec"
   )
-  class(res) <- "select_spec"
-
-  res
 }