Skip to content

Commit

Permalink
Revert "Automatically add needed cpp11 namespace directive (#1921)"
Browse files Browse the repository at this point in the history
This reverts commit 9ac020d.
  • Loading branch information
jennybc committed Feb 13, 2024
1 parent 6f089a4 commit f237e0f
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 17 deletions.
1 change: 0 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@
^internal$
^revdep-cloud$
^CRAN-SUBMISSION$
^\.vscode$
2 changes: 0 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# usethis (development version)

* `use_cpp11()` now automatically updates the `NAMESPACE` (@pachadotdev, #1921).

# usethis 2.2.2

* Implicit usage of `numeric_version()` via comparison now always provides
Expand Down
6 changes: 0 additions & 6 deletions R/cpp11.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use_cpp11 <- function() {
check_installed("cpp11")
check_is_package("use_cpp11()")
check_uses_roxygen("use_cpp11()")
check_has_package_doc("use_cpp11()")
use_src()

use_dependency("cpp11", "LinkingTo")
Expand All @@ -25,11 +24,6 @@ use_cpp11 <- function() {

check_cpp_register_deps()

roxygen_ns_append(
sprintf("@useDynLib %s, .registration = TRUE", project_name())
)
roxygen_update_ns()

invisible()
}

Expand Down
9 changes: 1 addition & 8 deletions tests/testthat/test-cpp11.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,10 @@ test_that("use_cpp11() requires a package", {
test_that("use_cpp11() creates files/dirs, edits DESCRIPTION and .gitignore", {
create_local_package()
use_roxygen_md()
use_package_doc()

local_interactive(FALSE)
local_check_installed()
local_mocked_bindings(
check_cpp_register_deps = function() invisible()
# project_name = function() "testpkg"
)
local_mocked_bindings(check_cpp_register_deps = function() invisible())

use_cpp11()

Expand All @@ -25,9 +21,6 @@ test_that("use_cpp11() creates files/dirs, edits DESCRIPTION and .gitignore", {

ignores <- read_utf8(proj_path("src", ".gitignore"))
expect_contains(ignores, c("*.o", "*.so", "*.dll"))

namespace <- read_utf8(proj_path("NAMESPACE"))
expect_match(namespace, "useDynLib", all = FALSE)
})

test_that("check_cpp_register_deps is silent if all installed, emits todo if not", {
Expand Down

0 comments on commit f237e0f

Please sign in to comment.