Respond to upcoming changes in glue::glue_collapse() (#310)

* Respond to changes proposed in tidyverse/glue#295

* Use the glue PR

* Remove glue remote, put back in Suggests (not Imports)

* Skip empty string tests for insufficient glue version

Author: jennybc

R/register.R

@@ -273,7 +273,7 @@ get_call_entries <- function(path, names, package) {
 
   redundant <- glue::glue_collapse(glue::glue('extern SEXP _{package}_{names}'), sep = '|')
 
-  if (length(redundant) > 0) {
+  if (length(redundant) > 0 && nzchar(redundant)) {
     redundant <- paste0("^", redundant)
     res <- res[!grepl(redundant, res)]
   }

tests/testthat/test-register.R

@@ -208,6 +208,8 @@ describe("get_registered_functions", {
 
 describe("generate_cpp_functions", {
   it("returns the empty string if there are no functions", {
+    skip_if_not_installed("glue", "1.6.2.9000")
+
     funs <- tibble::tibble(
       file = character(),
       line = integer(),
@@ -219,7 +221,7 @@ describe("generate_cpp_functions", {
       args = list(tibble::tibble(type = character(), name = character()))
     )
 
-    expect_equal(generate_cpp_functions(funs), character())
+    expect_equal(generate_cpp_functions(funs), "")
   })
 
   it("returns the wrapped function for a single void function with no arguments", {
@@ -377,6 +379,8 @@ extern \"C\" SEXP _cpp11_bar(SEXP baz) {
 
 describe("generate_r_functions", {
   it("returns the empty string if there are no functions", {
+    skip_if_not_installed("glue", "1.6.2.9000")
+
     funs <- tibble::tibble(
       file = character(),
       line = integer(),
@@ -388,7 +392,7 @@ describe("generate_r_functions", {
       args = list()
     )
 
-    expect_equal(generate_r_functions(funs), character())
+    expect_equal(generate_r_functions(funs), "")
   })
 
   it("returns the wrapped function for a single void function with no arguments", {