Bump minidump-writer to 0.11 (#103)

Author: hack3ric

.cargo/config.toml

@@ -43,7 +43,6 @@ rustflags = [
     "-Wclippy::map_err_ignore",
     "-Wclippy::map_flatten",
     "-Wclippy::map_unwrap_or",
-    "-Wclippy::match_on_vec_items",
     "-Wclippy::match_same_arms",
     "-Wclippy::match_wild_err_arm",
     "-Wclippy::match_wildcard_for_single_variants",

Cargo.lock

@@ -36,9 +36,9 @@ pub fn write_stderr(s: &'static str) {
 
 cfg_if::cfg_if! {
     if #[cfg(all(unix, not(target_os = "macos")))] {
-        /// The sole purpose of the unix module is to hook pthread_create to ensure
+        /// The sole purpose of the unix module is to hook `pthread_create` to ensure
         /// an alternate stack is installed for every native thread in case of a
-        /// stack overflow. This doesn't apply to MacOS as it uses exception ports,
+        /// stack overflow. This doesn't apply to `MacOS` as it uses exception ports,
         /// which are always delivered to a specific thread owned by the exception
         /// handler
         pub mod unix;

crash-handler/src/lib.rs

@@ -17,8 +17,8 @@ anyhow = "1.0"
 clap = { version = "4.0", features = ["derive"] }
 cfg-if = "1.0"
 crash-handler = { path = "../crash-handler" }
-minidump = "0.25"
-minidump-common = "0.25"
+minidump = "0.26"
+minidump-common = "0.26"
 minidumper = { path = "../minidumper" }
 # This has some crazy dependencies, can enable manually if needed
 #notify-rust = "4.5"

minidumper-test/Cargo.toml

@@ -101,14 +101,14 @@ fn make_dump_path(id: &str) -> PathBuf {
 pub fn spinup_server(id: &str, dump_path: Option<PathBuf>) -> Server {
     let dump_path = dump_path.unwrap_or_else(|| make_dump_path(id));
 
-    if dump_path.exists() {
-        if let Err(e) = std::fs::remove_file(&dump_path) {
-            panic!(
-                "failed to remove existing dump file {}: {}",
-                dump_path.display(),
-                e
-            );
-        }
+    if dump_path.exists()
+        && let Err(e) = std::fs::remove_file(&dump_path)
+    {
+        panic!(
+            "failed to remove existing dump file {}: {}",
+            dump_path.display(),
+            e
+        );
     }
 
     let mut server = minidumper::Server::with_name(id).expect("failed to start server");

minidumper-test/src/lib.rs

@@ -24,7 +24,7 @@ libc.workspace = true
 # Basic log emitting
 log = "0.4"
 # Minidump writing
-minidump-writer = "0.10"
+minidump-writer = "0.11"
 # Event loop
 polling = "3.2"
 # Nicer locking primitives

minidumper/Cargo.toml

@@ -21,10 +21,10 @@ fn main() {
 
                 let dump_path = std::path::PathBuf::from(format!("dumps/{uuid}.dmp"));
 
-                if let Some(dir) = dump_path.parent() {
-                    if !dir.try_exists()? {
-                        std::fs::create_dir_all(dir)?;
-                    }
+                if let Some(dir) = dump_path.parent()
+                    && !dir.try_exists()?
+                {
+                    std::fs::create_dir_all(dir)?;
                 }
                 let file = std::fs::File::create(&dump_path)?;
                 Ok((file, dump_path))

minidumper/examples/diskwrite.rs

@@ -23,7 +23,7 @@ pub enum Error {
     /// An error occurred during minidump generation
     #[cfg(any(target_os = "linux", target_os = "android"))]
     #[error(transparent)]
-    Writer(Box<minidump_writer::errors::WriterError>),
+    Writer(Box<minidump_writer::minidump_writer::errors::WriterError>),
     /// An error occurred during minidump generation
     #[cfg(target_os = "windows")]
     #[error(transparent)]
@@ -41,8 +41,8 @@ pub enum Error {
 }
 
 #[cfg(any(target_os = "linux", target_os = "android"))]
-impl From<minidump_writer::errors::WriterError> for Error {
-    fn from(we: minidump_writer::errors::WriterError) -> Self {
+impl From<minidump_writer::minidump_writer::errors::WriterError> for Error {
+    fn from(we: minidump_writer::minidump_writer::errors::WriterError) -> Self {
         Self::Writer(Box::new(we))
     }
 }

minidumper/src/errors.rs

@@ -461,25 +461,24 @@ impl Server {
                 };
 
                 let mut writer =
-                    minidump_writer::minidump_writer::MinidumpWriter::new(crash_context.inner.pid, crash_context.inner.tid);
+                    minidump_writer::minidump_writer::MinidumpWriterConfig::new(crash_context.inner.pid, crash_context.inner.tid);
 
                 writer.set_crash_context(crash_context);
+                let result = writer.write(&mut minidump_file);
             } else if #[cfg(target_os = "windows")] {
                 // SAFETY: Unfortunately this is a bit dangerous since we are relying on the crashing process
                 // to still be alive and still have the interior pointers in the crash context still at the
                 // same location in memory, unfortunately it's a bit hard to communicate this through so
                 // many layers, so really, we are falling back on Windows to actually correctly handle
                 // if the interior pointers have become invalid which it should? do ok with
                 let result =
-                    minidump_writer::minidump_writer::MinidumpWriter::dump_crash_context(crash_context, None, &mut minidump_file);
+                    minidump_writer::minidump_writer::MinidumpWriter::dump_crash_context(&crash_context, None, &mut minidump_file);
             } else if #[cfg(target_os = "macos")] {
                 let mut writer = minidump_writer::minidump_writer::MinidumpWriter::with_crash_context(crash_context);
+                let result = writer.dump(&mut minidump_file);
             }
         }
 
-        #[cfg(not(target_os = "windows"))]
-        let result = writer.dump(&mut minidump_file);
-
         // Notify the user handler about the minidump, even if we failed to write it
         Ok(handler.on_minidump_created(
             result