Nits/Cleanups

Author: CraftSpider

Cargo.lock

@@ -20,10 +20,10 @@ rust-version = "1.65.0"
 [workspace]
 members = ['crates/cpp_smoke_test', 'crates/as-if-std']
 exclude = [
-    'crates/without_debuginfo',
-    'crates/macos_frames_test',
-    'crates/line-tables-only',
-    'crates/debuglink',
+  'crates/without_debuginfo',
+  'crates/macos_frames_test',
+  'crates/line-tables-only',
+  'crates/debuglink',
 ]
 
 [dependencies]
@@ -36,7 +36,7 @@ serde = { version = "1.0", optional = true, features = ['derive'] }
 
 # Optionally demangle C++ frames' symbols in backtraces.
 cpp_demangle = { default-features = false, version = "0.4.0", optional = true, features = [
-    "alloc",
+  "alloc",
 ] }
 
 [target.'cfg(not(all(windows, target_env = "msvc", not(target_vendor = "uwp"))))'.dependencies]

Cargo.toml

@@ -93,7 +93,7 @@ impl Frame {
     }
 }
 
-#[repr(C, align(16))] // required by `CONTEXT`, is a FIXME in winapi right now
+#[repr(C, align(16))] // required by `CONTEXT`, is a FIXME in windows metadata right now
 struct MyContext(CONTEXT);
 
 #[inline(always)]
@@ -176,7 +176,7 @@ pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
             };
 
             while dbghelp.StackWalk64()(
-                image as _,
+                image as u32,
                 process,
                 thread,
                 frame_ptr,

src/backtrace/dbghelp32.rs

@@ -48,7 +48,7 @@ impl Frame {
     }
 }
 
-#[repr(C, align(16))] // required by `CONTEXT`, is a FIXME in winapi right now
+#[repr(C, align(16))] // required by `CONTEXT`, is a FIXME in windows metadata right now
 struct MyContext(CONTEXT);
 
 #[cfg(any(target_arch = "x86_64", target_arch = "arm64ec"))]

src/backtrace/dbghelp64.rs

@@ -9,10 +9,10 @@
 //! said, `dbghelp.dll` almost always successfully loads on Windows.
 //!
 //! Note though that since we're loading all this support dynamically we can't
-//! actually use the raw definitions in `winapi`, but rather we need to define
+//! actually use the raw definitions in `windows_sys`, but rather we need to define
 //! the function pointer types ourselves and use that. We don't really want to
-//! be in the business of duplicating winapi, so we have a Cargo feature
-//! `verify-windows-sys` which asserts that all bindings match those in winapi and
+//! be in the business of duplicating auto-generated bindings, so we have a Cargo feature
+//! `verify-windows-sys` which asserts that all bindings match those in `windows_sys.rs` and
 //! this feature is enabled on CI.
 //!
 //! Finally, you'll note here that the dll for `dbghelp.dll` is never unloaded,

src/dbghelp.rs

@@ -248,6 +248,6 @@ mod lock {
     not(target_vendor = "uwp")
 ))]
 mod dbghelp;
-// Auto-generated by windows_bindgen in build.rs
+// Auto-generated by windows-bindgen/riddle
 #[cfg(windows)]
 mod windows_sys;