From 1b9567bc0253ef0cd13146fff8d868b033831f88 Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Sat, 11 May 2024 14:30:58 +0200 Subject: [PATCH 1/2] Update touchstone config --- touchstone/config.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/touchstone/config.json b/touchstone/config.json index 84f9d3441..601c57ee2 100644 --- a/touchstone/config.json +++ b/touchstone/config.json @@ -1,9 +1,8 @@ { "os": "ubuntu-latest", - "r": "4.2", - "rspm": "https://packagemanager.rstudio.com/all/__linux__/focal/2023-03-01", + "r": "4.4", + "rspm": "https://packagemanager.rstudio.com/all/__linux__/focal/2024-05-01", "benchmarking_repo": "lorenzwalthert/here", "benchmarking_ref": "bf0167746da7fe4fb156082bad93c9e5cd3386bd", "benchmarking_path": "touchstone/sources/here", - } From 2823db4f803cf5221f27c9f2639148e636cb6c1f Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Sat, 11 May 2024 14:35:24 +0200 Subject: [PATCH 2/2] Fix `paste_linter()` lints --- R/roxygen-examples-parse.R | 2 +- R/utils-cache.R | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/R/roxygen-examples-parse.R b/R/roxygen-examples-parse.R index ac25ce950..a428acae4 100644 --- a/R/roxygen-examples-parse.R +++ b/R/roxygen-examples-parse.R @@ -179,6 +179,6 @@ needs_rd_emulation <- function(roxygen) { #' @keywords internal post_parse_roxygen <- function(raw) { raw %>% - paste0(collapse = "") %>% + paste(collapse = "") %>% convert_newlines_to_linebreaks() } diff --git a/R/utils-cache.R b/R/utils-cache.R index 6b57fb788..ce255587e 100644 --- a/R/utils-cache.R +++ b/R/utils-cache.R @@ -9,7 +9,7 @@ hash_standardize <- function(text) { text %>% convert_newlines_to_linebreaks() %>% enc2utf8() %>% - paste0(collapse = "\n") %>% + paste(collapse = "\n") %>% list() }