commit 24500fba44633c3a2569d1ca41a7ce5198acb888
author Chris Denton <chris@chrisdenton.dev> Thu Jan 23 05:04:09 2025 +0000
committer Chris Denton <chris@chrisdenton.dev> Thu Jan 23 05:04:09 2025 +0000
tree 9d56abcdb8cb56c981cf697e43f14a4704ac646f
parent e33eaac8caf46d0d3cc57f8d152529e8b7ae1b78

Move dbghelp64.rs to win64.rs

Windows 64-bit doesn't use dbghelp for tracing, so the name was confusing.

src/backtrace/mod.rs

diff --git a/src/backtrace/mod.rs b/src/backtrace/mod.rs
index 75925d9..22cebc9 100644
--- a/src/backtrace/mod.rs
+++ b/src/backtrace/mod.rs
@@ -189,15 +189,15 @@
     } else if #[cfg(all(windows, not(target_vendor = "uwp")))] {
         cfg_if::cfg_if! {
             if #[cfg(any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "arm64ec"))] {
-                mod dbghelp64;
-                use dbghelp64 as dbghelp;
+                mod win64;
+                use self::win64::trace as trace_imp;
+                pub(crate) use self::win64::Frame as FrameImp;
             } else if #[cfg(any(target_arch = "x86", target_arch = "arm"))] {
                 mod dbghelp32;
-                use dbghelp32 as dbghelp;
+                use self::dbghelp32::trace as trace_imp;
+                pub(crate) use self::dbghelp32::Frame as FrameImp;
             }
         }
-        use self::dbghelp::trace as trace_imp;
-        pub(crate) use self::dbghelp::Frame as FrameImp;
     } else {
         mod noop;
         use self::noop::trace as trace_imp;

src/backtrace/win64.rs

diff --git a/src/backtrace/dbghelp64.rs b/src/backtrace/win64.rs
similarity index 97%
rename from src/backtrace/dbghelp64.rs
rename to src/backtrace/win64.rs
index fd31388..a338526 100644
--- a/src/backtrace/dbghelp64.rs
+++ b/src/backtrace/win64.rs
@@ -77,11 +77,6 @@
     }
 }
 
-#[cfg(any(
-    target_arch = "x86_64",
-    target_arch = "aarch64",
-    target_arch = "arm64ec"
-))]
 #[inline(always)]
 pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
     use core::ptr;