minor rebase woes

Author: dsweber2

NAMESPACE

@@ -241,11 +241,13 @@ importFrom(hardhat,run_mold)
 importFrom(magrittr,"%>%")
 importFrom(quantreg,rq)
 importFrom(recipes,bake)
+importFrom(recipes,detect_step)
 importFrom(recipes,prep)
 importFrom(rlang,"!!")
 importFrom(rlang,"%@%")
 importFrom(rlang,"%||%")
 importFrom(rlang,":=")
+importFrom(rlang,as_function)
 importFrom(rlang,caller_env)
 importFrom(rlang,global_env)
 importFrom(rlang,is_null)
@@ -261,8 +263,6 @@ importFrom(stats,predict)
 importFrom(stats,qnorm)
 importFrom(stats,quantile)
 importFrom(stats,residuals)
-importFrom(tibble,as_tibble)
-importFrom(tibble,is_tibble)
 importFrom(tibble,tibble)
 importFrom(tidyr,drop_na)
 importFrom(tidyr,unnest)

R/step_adjust_latency.R

@@ -182,7 +182,6 @@ step_adjust_latency_new <-
 # lags introduces max(lags) NA's after the max_time_value.
 #' @export
 prep.step_adjust_latency <- function(x, training, info = NULL, ...) {
-
   # get the columns used, even if it's all of them
   terms_used <- x$columns
   if (length(terms_used) == 0) {

tests/testthat/test-step_adjust_latency.R

@@ -141,18 +141,20 @@ test_that("epi_adjust_latency insist there's steps before it", {
   )
   expect_error(
     r5 <- epi_recipe(x) %>%
-    step_epi_lag(death_rate, lag = c(0, 6, 11)) %>%
+      step_epi_lag(death_rate, lag = c(0, 6, 11)) %>%
       step_adjust_latency(method = "extend_ahead"),
     regexp = "extend_ahead"
   )
 })
 
 test_that("epi_adjust_latency warns against removing NA's beforehand", {
-  expect_error(r5 <- epi_recipe(x) %>%
-                 step_epi_lag(death_rate, lag = c(0, 6, 11)) %>%
-                 step_epi_lag(case_rate, lag = c(1, 5)) %>%
-                 step_epi_naomit() %>%
-                 step_adjust_latency(method = "extend_lags"),
-    regexp = "adjust_latency needs to occur before any `NA` removal")
+  expect_error(
+    r5 <- epi_recipe(x) %>%
+      step_epi_lag(death_rate, lag = c(0, 6, 11)) %>%
+      step_epi_lag(case_rate, lag = c(1, 5)) %>%
+      step_epi_naomit() %>%
+      step_adjust_latency(method = "extend_lags"),
+    regexp = "adjust_latency needs to occur before any `NA` removal"
+  )
 })
 # todo check that epi_adjust_latency errors for nonsense `as_of`'s