Drop stringi dep (#1839)

Author: hadley

DESCRIPTION

@@ -31,7 +31,6 @@ Imports:
     pkgload (>= 1.0.2),
     R6 (>= 2.1.2),
     rlang (>= 1.1.0),
-    stringi,
     stringr (>= 1.0.0),
     utils,
     withr,

R/rd-backref.R

@@ -17,13 +17,12 @@ format.rd_section_backref <- function(x, ...) {
     fsep = "/"
   )
 
-  lines <- stringi::stri_wrap(
+  lines <- strwrap(
     paste0("Please edit documentation in ", paste(filename, collapse = ", ")),
     initial = "% ",
     prefix = "%   ",
-    width = 80,
-    whitespace_only = TRUE
+    width = 80
   )
 
-  paste0(paste0(lines, collapse = "\n"))
+  paste0(lines, collapse = "\n")
 }

R/utils.R

@@ -9,88 +9,49 @@ internal_f <- function(p, f) {
   if (length(a) > 0) a else b
 }
 
-subs <- matrix(
-  ncol = 2,
-  byrow = T,
-  c(
-    # Common special function names
-    '[<-',
-    'subset',
-    '[',
-    'sub',
-    '<-',
-    'set',
-
-    # Infix verbs
-    '!',
-    'not',
-    '&',
-    'and',
-    '|',
-    'or',
-    '*',
-    'times',
-    '+',
-    'plus',
-    '^',
-    'pow',
-
-    # Others
-    '"',
-    'quote',
-    '#',
-    'hash',
-    '$',
-    'cash',
-    '%',
-    'grapes',
-    "'",
-    'single-quote',
-    '(',
-    'open-paren',
-    ')',
-    'close-paren',
-    ':',
-    'colon',
-    ';',
-    'semi-colon',
-    '<',
-    'less-than',
-    '==',
-    'equals',
-    '=',
-    'equals',
-    '>',
-    'greater-than',
-    '?',
-    'help',
-    '@',
-    'at',
-    ']',
-    'close-brace',
-    '\\',
-    'backslash',
-    '/',
-    'slash',
-    '`',
-    'tick',
-    '{',
-    'open-curly',
-    '}',
-    'close',
-    '~',
-    'twiddle'
-  )
+subs <- c(
+  # Common special function names
+  "[<-" = "-subset-",
+  "[" = "-sub-",
+  "<-" = "-set-",
+
+  # Infix verbs
+  "!" = "-not-",
+  "&" = "-and-",
+  "|" = "-or-",
+  "*" = "-times-",
+  "+" = "-plus-",
+  "^" = "-pow-",
+
+  # Others
+  '"' = "-quote-",
+  "#" = "-hash-",
+  "$" = "-cash-",
+  "%" = "-grapes-",
+  "'" = "-single-quote-",
+  "(" = "-open-paren-",
+  ")" = "-close-paren-",
+  ":" = "-colon-",
+  ";" = "-semi-colon-",
+  "<" = "-less-than-",
+  "==" = "-equals-",
+  "=" = "-equals-",
+  ">" = "-greater-than-",
+  "?" = "-help-",
+  "@" = "-at-",
+  "]" = "-close-brace-",
+  "\\" = "-backslash-",
+  "/" = "-slash-",
+  "`" = "-tick-",
+  "{" = "-open-curly-",
+  "}" = "-close-",
+  "~" = "-twiddle-"
 )
-subs[, 2] <- paste0("-", subs[, 2], "-")
 
 nice_name <- function(x) {
-  x <- stringi::stri_replace_all_fixed(
-    x,
-    subs[, 1],
-    subs[, 2],
-    vectorize_all = FALSE
-  )
+  for (i in seq_along(subs)) {
+    x <- gsub(names(subs)[[i]], subs[[i]], x, fixed = TRUE)
+  }
 
   # Clean up any remaining
   x <- str_replace_all(x, "[^A-Za-z0-9_.-]+", "-")

vignettes/extending.Rmd

@@ -263,7 +263,7 @@ roxy_tag_parse.roxy_tag_memo <- function(x) {
     return()
   }
 
-  parsed <- stringi::stri_match(str = x$raw, regex = "\\[(.*)\\](.*)")[1, ]
+  parsed <- regmatches(x$raw, regexec("\\[(.*)\\](.*)", x$raw))[[1]]
 
   x$val <- list(
     header = parsed[[2]],