lintr with vector logic

rjdverse · Jul 9, 2024 · 6383009 · 6383009
1 parent c24c3a3
commit 6383009
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/R/2_finite_filters.R b/R/2_finite_filters.R
@@ -34,17 +34,17 @@ finite_filters.moving_average <- function(sfilter,
                                           rfilters = NULL,
                                           lfilters = NULL,
                                           first_to_last = FALSE){
-  if (is.null(lfilters) & !is.null(rfilters)) {
+  if (is.null(lfilters) && !is.null(rfilters)) {
     if (first_to_last) {
       rfilters <- rev(rfilters)
     }
     lfilters <- rev(lapply(rfilters, rev.moving_average))
-  } else if (!is.null(lfilters) & is.null(rfilters)) {
+  } else if (!is.null(lfilters) && is.null(rfilters)) {
     if (!first_to_last) {
       lfilters <- rev(lfilters)
     }
     rfilters <- rev(lapply(lfilters, rev.moving_average))
-  } else if (is.null(lfilters) & is.null(rfilters)) {
+  } else if (is.null(lfilters) && is.null(rfilters)) {
     rfilters <- lfilters <- list()
 
   }

diff --git a/R/plots.R b/R/plots.R
@@ -288,7 +288,7 @@ remove_bound_NA <- function(x) {
     j <- j + 1
   }
 
-  if (is.null(remove_i_first) & is.null(remove_i_last)){
+  if (is.null(remove_i_first) && is.null(remove_i_last)){
     # list(data = x, leading = 0,
     #      trailing = 0)
   } else {