cleanup: let-chain in style selection

Author: workingjubilee

src/capture.rs

@@ -5,9 +5,9 @@ use crate::PrintFmt;
 use crate::resolve;
 use crate::{BacktraceFmt, Symbol, SymbolName, resolve_frame, trace};
 use core::ffi::c_void;
-use std::fmt;
 use std::path::{Path, PathBuf};
 use std::prelude::v1::*;
+use std::{env, fmt};
 
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
@@ -490,22 +490,21 @@ impl fmt::Debug for Backtrace {
             PrintFmt::Short
         };
 
-        // When printing paths we try to strip the cwd if it exists, otherwise
-        // we just print the path as-is. Note that we also only do this for the
         // short format, because if it's full we presumably want to print
         // everything.
-        let cwd = std::env::current_dir();
         let mut print_path =
             move |fmt: &mut fmt::Formatter<'_>, path: crate::BytesOrWideString<'_>| {
                 let path = path.into_path_buf();
-                if style != PrintFmt::Full {
-                    if let Ok(cwd) = &cwd {
-                        if let Ok(suffix) = path.strip_prefix(cwd) {
-                            return fmt::Display::fmt(&suffix.display(), fmt);
-                        }
-                    }
+                // When printing paths we try to strip the cwd if it exists, otherwise
+                // we just print the path as-is
+                if style == PrintFmt::Short
+                    && let Ok(cwd) = &env::current_dir()
+                    && let Ok(suffix) = path.strip_prefix(cwd)
+                {
+                    fmt::Display::fmt(&suffix.display(), fmt)
+                } else {
+                    fmt::Display::fmt(&path.display(), fmt)
                 }
-                fmt::Display::fmt(&path.display(), fmt)
             };
 
         let mut f = BacktraceFmt::new(fmt, style, &mut print_path);