Merge pull request #279 from dtolnay/contextbacktrace

Remove 2 frames of noise from 'context' backtraces
dtolnay · Oct 20, 2022 · 54fc812 · 54fc812
2 parents f2123ab + 131249b
commit 54fc812
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/context.rs b/src/context.rs
@@ -47,15 +47,23 @@ where
     where
         C: Display + Send + Sync + 'static,
     {
-        self.map_err(|error| error.ext_context(context))
+        // Not using map_err to save 2 useless frames off the captured backtrace
+        // in ext_context.
+        match self {
+            Ok(ok) => Ok(ok),
+            Err(error) => Err(error.ext_context(context)),
+        }
     }
 
     fn with_context<C, F>(self, context: F) -> Result<T, Error>
     where
         C: Display + Send + Sync + 'static,
         F: FnOnce() -> C,
     {
-        self.map_err(|error| error.ext_context(context()))
+        match self {
+            Ok(ok) => Ok(ok),
+            Err(error) => Err(error.ext_context(context())),
+        }
     }
 }