not explicitely use universal_names, just check for duplictaes and ap…

…pend ..<position> in that case
tidyverse · Jan 29, 2019 · 08d6f1b · 08d6f1b
1 parent d10f01b
commit 08d6f1b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/R/colwise-mutate.R b/R/colwise-mutate.R
@@ -308,10 +308,11 @@ manip_apply_syms <- function(funs, syms, tbl) {
   } else {
     nms <- names(funs)
     nms[nms == "<fn>"] <- "fn"
-    nms <- tibble:::universal_names(nms, quiet = TRUE)
-    # while(any(dup <- duplicated(nms))) {
-    #   nms[dup] <- paste(nms[dup], which(dup), sep = ".")
-    # }
+
+    # append ..<position> to duplicates
+    dup <- duplicated(nms)
+    test <- nms %in% nms[dup]
+    nms[test] <- paste(nms[test], which(test), sep = "..")
     names(funs) <- nms
 
     if (length(syms) == 1 && all(unnamed)) {

diff --git a/inst/include/dplyr/hybrid/scalar_result/min_max.h b/inst/include/dplyr/hybrid/scalar_result/min_max.h
@@ -24,8 +24,8 @@ class MinMax : public HybridVectorScalarResult<REALSXP, SlicedTibble, MinMax<RTY
     expr(expr_)
   {}
 
-  ~MinMax(){
-    if(NA_RM && warn) {
+  ~MinMax() {
+    if (NA_RM && warn) {
       if (MINIMUM) {
         Rf_warningcall(expr, "no non-missing arguments to min; returning Inf");
       } else {

diff --git a/tests/testthat/test-colwise-mutate.R b/tests/testthat/test-colwise-mutate.R
@@ -44,7 +44,6 @@ test_that("default names are smallest unique set", {
   expect_named(summarise_at(df, vars(x), list(mean = mean, sd = sd)), c("mean", "sd"))
   expect_named(summarise_at(df, vars(x:y), list(mean = mean, sd = sd)), c("x_mean", "y_mean", "x_sd", "y_sd"))
 
-  skip("discussed in #4125")
   expect_named(summarise_at(df, vars(x:y), funs(base::mean, stats::sd)), c("x_base::mean", "y_base::mean", "x_stats::sd", "y_stats::sd"))
 })