Skip to content

Commit 6c11e41

Browse files
committed
Bump minidump-writer to 0.11
Also bumps minidump version to 0.26 in minidumper-test.
1 parent 0744245 commit 6c11e41

File tree

5 files changed

+57
-34
lines changed

5 files changed

+57
-34
lines changed

Cargo.lock

Lines changed: 48 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

minidumper-test/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ anyhow = "1.0"
1717
clap = { version = "4.0", features = ["derive"] }
1818
cfg-if = "1.0"
1919
crash-handler = { path = "../crash-handler" }
20-
minidump = "0.25"
21-
minidump-common = "0.25"
20+
minidump = "0.26"
21+
minidump-common = "0.26"
2222
minidumper = { path = "../minidumper" }
2323
# This has some crazy dependencies, can enable manually if needed
2424
#notify-rust = "4.5"

minidumper/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ libc.workspace = true
2424
# Basic log emitting
2525
log = "0.4"
2626
# Minidump writing
27-
minidump-writer = "0.10"
27+
minidump-writer = "0.11"
2828
# Event loop
2929
polling = "3.2"
3030
# Nicer locking primitives

minidumper/src/errors.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub enum Error {
2323
/// An error occurred during minidump generation
2424
#[cfg(any(target_os = "linux", target_os = "android"))]
2525
#[error(transparent)]
26-
Writer(Box<minidump_writer::errors::WriterError>),
26+
Writer(Box<minidump_writer::minidump_writer::errors::WriterError>),
2727
/// An error occurred during minidump generation
2828
#[cfg(target_os = "windows")]
2929
#[error(transparent)]
@@ -41,8 +41,8 @@ pub enum Error {
4141
}
4242

4343
#[cfg(any(target_os = "linux", target_os = "android"))]
44-
impl From<minidump_writer::errors::WriterError> for Error {
45-
fn from(we: minidump_writer::errors::WriterError) -> Self {
44+
impl From<minidump_writer::minidump_writer::errors::WriterError> for Error {
45+
fn from(we: minidump_writer::minidump_writer::errors::WriterError) -> Self {
4646
Self::Writer(Box::new(we))
4747
}
4848
}

minidumper/src/ipc/server.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,10 @@ impl Server {
461461
};
462462

463463
let mut writer =
464-
minidump_writer::minidump_writer::MinidumpWriter::new(crash_context.inner.pid, crash_context.inner.tid);
464+
minidump_writer::minidump_writer::MinidumpWriterConfig::new(crash_context.inner.pid, crash_context.inner.tid);
465465

466466
writer.set_crash_context(crash_context);
467+
let result = writer.write(&mut minidump_file);
467468
} else if #[cfg(target_os = "windows")] {
468469
// SAFETY: Unfortunately this is a bit dangerous since we are relying on the crashing process
469470
// to still be alive and still have the interior pointers in the crash context still at the
@@ -474,12 +475,10 @@ impl Server {
474475
minidump_writer::minidump_writer::MinidumpWriter::dump_crash_context(crash_context, None, &mut minidump_file);
475476
} else if #[cfg(target_os = "macos")] {
476477
let mut writer = minidump_writer::minidump_writer::MinidumpWriter::with_crash_context(crash_context);
478+
let result = writer.dump(&mut minidump_file);
477479
}
478480
}
479481

480-
#[cfg(not(target_os = "windows"))]
481-
let result = writer.dump(&mut minidump_file);
482-
483482
// Notify the user handler about the minidump, even if we failed to write it
484483
Ok(handler.on_minidump_created(
485484
result

0 commit comments

Comments
 (0)