No more distinct_(), namespace for filter

juliasilge · Sep 12, 2022 · 0362e95 · 0362e95
1 parent f6b1467
commit 0362e95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/R/pairwise_count.R b/R/pairwise_count.R
@@ -52,7 +52,7 @@ pairwise_count_ <- function(tbl, item, feature, wt = NULL, ...) {
   }
 
   tbl %>%
-    distinct_(.dots = c(item, feature), .keep_all = TRUE) %>%
+    distinct(.data[[item]], .data[[feature]], .keep_all = TRUE) %>%
     mutate(..value = 1) %>%
     func(item, feature, wt) %>%
     rename(n = value)

diff --git a/R/squarely.R b/R/squarely.R
@@ -76,10 +76,10 @@ squarely_ <- function(.f, diag = FALSE,
     ret$item2 <- as.integer(ret$item2)
 
     if (!upper) {
-      ret <- filter(ret, item1 <= item2)
+      ret <- dplyr::filter(ret, item1 <= item2)
     }
     if (!diag) {
-      ret <- filter(ret, item1 != item2)
+      ret <- dplyr::filter(ret, item1 != item2)
     }
 
     ret$item1 <- item_u[ret$item1]