Merge branch 'main' into f1032-remove-blank-lines-after-and-before-parens

IndrajeetPatil · web-flow · commit 1f608313a809 · 2024-05-11T16:09:54.000+02:00
diff --git 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
@@ -9,7 +9,7 @@ hash_standardize <- function(text) {
   text %>%
     convert_newlines_to_linebreaks() %>%
     enc2utf8() %>%
-    paste0(collapse = "\n") %>%
+    paste(collapse = "\n") %>%
     list()
 }
 
diff --git 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",
-
 }

Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,6 @@ needs_rd_emulation <- function(roxygen) {`
`179`	`179`	`#' @keywords internal`
`180`	`180`	`post_parse_roxygen <- function(raw) {`
`181`	`181`	`raw %>%`
`182`		`- paste0(collapse = "") %>%`
	`182`	`+ paste(collapse = "") %>%`
`183`	`183`	`convert_newlines_to_linebreaks()`
`184`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ hash_standardize <- function(text) {`
`9`	`9`	`text %>%`
`10`	`10`	`convert_newlines_to_linebreaks() %>%`
`11`	`11`	`enc2utf8() %>%`
`12`		`- paste0(collapse = "\n") %>%`
	`12`	`+ paste(collapse = "\n") %>%`
`13`	`13`	`list()`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"os": "ubuntu-latest",`
`3`		`- "r": "4.2",`
`4`		`- "rspm": "https://packagemanager.rstudio.com/all/__linux__/focal/2023-03-01",`
	`3`	`+ "r": "4.4",`
	`4`	`+ "rspm": "https://packagemanager.rstudio.com/all/__linux__/focal/2024-05-01",`
`5`	`5`	`"benchmarking_repo": "lorenzwalthert/here",`
`6`	`6`	`"benchmarking_ref": "bf0167746da7fe4fb156082bad93c9e5cd3386bd",`
`7`	`7`	`"benchmarking_path": "touchstone/sources/here",`
`8`		`-`
`9`	`8`	`}`