Only generate the trace_back() as needed (#177)

r-lib · Nov 6, 2023 · 691afac · 691afac
1 parent da5e39b
commit 691afac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,8 @@
 # lifecycle (development version)
 
+* Repeated calls to `deprecate_soft()` and `deprecate_warn()` are faster thanks
+  to some internal refactoring (#177).
+
 * Switch from `expr_deparse()` to `deparse()`. This improves performance
   considerably and the cost of making some unusual function calls mildly 
   less appealing (#167).

diff --git a/R/deprecate.R b/R/deprecate.R
@@ -115,13 +115,13 @@ deprecate_soft <- function(when,
     default =
       if (direct) {
         always <- verbosity == "warning"
-        trace <- trace_back(bottom = caller_env())
+        trace_env <- caller_env()
         deprecate_warn0(
           msg,
           id,
-          trace,
           always = always,
           direct = TRUE,
+          trace_env = trace_env,
           user_env = user_env
         )
       },
@@ -157,13 +157,13 @@ deprecate_warn <- function(when,
     default = {
       direct <- is_direct(user_env)
       always <- direct && (always || verbosity == "warning")
-      trace <- trace_back(bottom = caller_env())
+      trace_env <- caller_env()
       deprecate_warn0(
         msg,
         id,
-        trace,
         always = always,
         direct = direct,
+        trace_env = trace_env,
         user_env = user_env
       )
     },
@@ -188,10 +188,10 @@ deprecate_stop <- function(when,
 
 deprecate_warn0 <- function(msg,
                             id = NULL,
-                            trace = NULL,
                             always = FALSE,
                             direct = FALSE,
                             call = caller_env(),
+                            trace_env = caller_env(),
                             user_env = caller_env(2)) {
   id <- id %||% paste_line(msg)
   if (!always && !needs_warning(id, call = call)) {
@@ -242,6 +242,9 @@ deprecate_warn0 <- function(msg,
 
     footer
   }
+
+  trace <- trace_back(bottom = trace_env)
+
   wrn <- new_deprecated_warning(msg, trace, footer = footer)
 
   # Record muffled warnings if testthat is running because it