Revert changes

tidyverse · Oct 21, 2022 · 227003d · 227003d
1 parent 2c8763b
commit 227003d
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/R/step-setnames.R b/R/step-setnames.R
@@ -6,17 +6,13 @@ step_setnames <- function(x, old, new, in_place, rename_groups = FALSE) {
   stopifnot(is_bool(in_place))
   stopifnot(is_bool(rename_groups))
 
-  x_vars <- replace_setnames_na(x$vars)
-  old <- replace_setnames_na(old)
-  new <- replace_setnames_na(new)
-
   if (is.integer(old)) {
     locs <- old
   } else {
-    locs <- vctrs::vec_match(old, x_vars)
+    locs <- vctrs::vec_match(old, x$vars)
   }
 
-  name_changed <- x_vars[locs] != new
+  name_changed <- x$vars[locs] != new
   old <- old[name_changed]
   new <- new[name_changed]
   locs <- locs[name_changed]
@@ -25,7 +21,7 @@ step_setnames <- function(x, old, new, in_place, rename_groups = FALSE) {
     return(x)
   }
 
-  new_vars <- x_vars
+  new_vars <- x$vars
   new_vars[locs] <- new
   out <- step_call(x,
     "setnames",
@@ -41,11 +37,3 @@ step_setnames <- function(x, old, new, in_place, rename_groups = FALSE) {
 
   out
 }
-
-# Replace character `NA` names with "NA"
-replace_setnames_na <- function(x) {
-  if (is.character(x)) {
-    x <- vctrs::vec_assign(x, is.na(x), "NA")
-  }
-  x
-}