From a89754183e6bd74d1aff7af03dd830d9f505614c Mon Sep 17 00:00:00 2001 From: Ilia Kosenkov Date: Sat, 3 Aug 2024 23:04:31 +0300 Subject: [PATCH] More housekeeping --- R/find_exports.R | 2 +- R/source.R | 2 +- R/try_save_all.R | 2 +- tests/testthat/test-make-module-macro.R | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/R/find_exports.R b/R/find_exports.R index c7afa20b..52a67684 100644 --- a/R/find_exports.R +++ b/R/find_exports.R @@ -20,7 +20,7 @@ find_extendr_attrs_ids <- function(lns) { } # Gets function/module metadata from a subset of lines. -# Finds first occurence of `fn` or `impl`. +# Finds first occurrence of `fn` or `impl`. extract_meta <- function(lns) { # Matches fn|impl<'a> item_name result <- stringi::stri_match_first_regex( diff --git a/R/source.R b/R/source.R index 263b5fac..8ec5adb5 100644 --- a/R/source.R +++ b/R/source.R @@ -39,7 +39,7 @@ #' calls to [rust_source()]. #' @param quiet Logical indicating whether compile output should be generated or not. #' @param use_rtools Logical indicating whether to append the path to Rtools -#' to the `PATH` variable on Windows using the `RTOOLS40_HOME` environment +#' to the `PATH` variable on Windows using the `RTOOLS4X_HOME` environment #' variable (if it is set). The appended path depends on the process #' architecture. Does nothing on other platforms. #' @param use_dev_extendr Logical indicating whether to use development version of diff --git a/R/try_save_all.R b/R/try_save_all.R index 0041728a..220f653a 100644 --- a/R/try_save_all.R +++ b/R/try_save_all.R @@ -1,6 +1,6 @@ #' Try to save open files if \pkg{rextendr} is called from an IDE. #' -#' Uses rstudio API (if available) to save modfied files. +#' Uses rstudio API (if available) to save modified files. #' Improves package development experience within RStudio. #' @param quiet Logical scalar indicating whether the output should be quiet (`TRUE`) #' or verbose (`FALSE`). diff --git a/tests/testthat/test-make-module-macro.R b/tests/testthat/test-make-module-macro.R index 240b16ae..e5aead68 100644 --- a/tests/testthat/test-make-module-macro.R +++ b/tests/testthat/test-make-module-macro.R @@ -84,11 +84,11 @@ test_that("Macro generation fails on invalid comments in code", { ) expect_rextendr_error( make_module_macro("/*/*/**/"), - "Found 3 occurences" + "Found 3 occurrences" ) expect_rextendr_error( make_module_macro("/*/*/**/"), - "Found 1 occurence" + "Found 1 occurrence" ) expect_rextendr_error(