fix merge conflict

ropensci-review-tools · Sep 26, 2024 · 2f1ecaf · 2f1ecaf
2 parents b122675 + 9083c9f
commit 2f1ecaf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 70 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -88,7 +88,6 @@ Collate:
     'chk_rcmdcheck.R'
     'chk_tnf.R'
     'gp.R'
-    'my_linters.R'
     'package.R'
     'prep_covr.R'
     'prep_cyclocomp.R'

diff --git a/NAMESPACE b/NAMESPACE
@@ -22,7 +22,6 @@ importFrom(desc,desc_get)
 importFrom(desc,desc_get_collate)
 importFrom(desc,description)
 importFrom(jsonlite,toJSON)
-importFrom(lintr,Lint)
 importFrom(lintr,get_source_expressions)
 importFrom(lintr,lint_package)
 importFrom(praise,praise)

diff --git a/R/my_linters.R b/R/my_linters.R
diff --git a/R/prep_lintr.R b/R/prep_lintr.R
@@ -1,15 +1,21 @@
 
-#' @include my_linters.R
-
 linters_to_lint <- list(
   assignment_linter = lintr::assignment_linter(),
   line_length_linter = lintr::line_length_linter(80),
   package_hooks_linter = lintr::package_hooks_linter(),
   semicolon_linter = lintr::semicolon_linter(allow_compound = TRUE),
-  attach_detach_linter = attach_detach_linter(),
-  setwd_linter = setwd_linter(),
-  sapply_linter = sapply_linter(),
-  library_require_linter = library_require_linter(),
+  attach_detach_linter = lintr::undesirable_function_linter(
+    fun = lintr::default_undesirable_functions[c("attach", "detach")]
+  ),
+  setwd_linter = lintr::undesirable_function_linter(
+    fun = lintr::default_undesirable_functions["setwd"]
+  ),
+  sapply_linter = lintr::undesirable_function_linter(
+    fun = lintr::default_undesirable_functions["sapply"]
+  ),
+  library_require_linter = lintr::undesirable_function_linter(
+    fun = lintr::default_undesirable_functions[c("library", "require")]
+  ),
   seq_linter = lintr::seq_linter()
 )