fix(glue): further fixes to deprecated glue behaviors (#19)

openpharma · Oct 15, 2024 · 4d7e41b · 4d7e41b
1 parent 6aa5a46
commit 4d7e41b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: roxytypes
 Title: Typed Parameter Tags for Integration with 'roxygen2'
-Version: 0.1.1
+Version: 0.1.2
 Authors@R:
     c(
       person(
@@ -34,4 +34,4 @@ Enhances:
     roxylint
 Config/Needs/documentation:
     roxylint
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# roxytypes v0.1.2
+
+* Further fixes to `glue::glue` use, a continuation of the fixes in v0.1.1.
+  (@dgkf #18)
+
 # roxytypes v0.1.1
 
 * Updates use of `glue::glue`, which previously made use of

diff --git a/R/tag_typed.R b/R/tag_typed.R
@@ -124,7 +124,7 @@ roxy_tag_rd.roxy_tag_typed <- function(x, base_path, env) {  # nolint
   desc <- if (is.function(format)) {
     do.call(format, append(list(x), x$val))
   } else {
-    glue::glue(format, .envir = x$val)
+    glue::glue_data(.x = as.list(x$val), format)
   }
 
   # handle markdown-style formatting using roxygen2 internals

diff --git a/R/tag_typedreturn.R b/R/tag_typedreturn.R
@@ -59,7 +59,7 @@ roxy_tag_rd.roxy_tag_typedreturn <- function(x, base_path, env) {  # nolint
   desc <- if (is.function(format)) {
     do.call(format, append(list(x), x$val))
   } else {
-    glue::glue(format, .envir = x$val)
+    glue::glue_data(.x = as.list(x$val), format)
   }
 
   # handle markdown-style formatting using roxygen2 internals