diff --git a/Cargo.lock b/Cargo.lock index 96ef9730..a80c8818 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,14 +4,14 @@ version = 3 [[package]] name = "addr2line" -version = "0.15.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ "cpp_demangle", "fallible-iterator", - "gimli 0.24.0", - "object 0.24.0", + "gimli 0.26.1", + "object 0.27.1", "rustc-demangle", ] @@ -561,15 +561,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "object" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170" -dependencies = [ - "flate2", -] - [[package]] name = "object" version = "0.25.3" @@ -585,6 +576,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" dependencies = [ + "flate2", "memchr", ] @@ -596,9 +588,9 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "os_pipe" -version = "0.9.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb233f06c2307e1f5ce2ecad9f8121cffbbee2c95428f44ea85222e460d0d213" +checksum = "0e3492ebca331b895fe23ed427dce2013d9b2e00c45964f12040b0db38b8ab27" dependencies = [ "libc", "winapi", @@ -720,12 +712,12 @@ dependencies = [ "colored", "defmt-decoder", "dirs", - "gimli 0.24.0", + "gimli 0.26.1", "git-version", "insta", "log", "nix", - "object 0.24.0", + "object 0.27.1", "os_pipe", "pretty_assertions", "probe-rs", diff --git a/Cargo.toml b/Cargo.toml index 74edc9ae..120772a1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/knurling-rs/probe-run" version = "0.3.0" [dependencies] -addr2line = { version = "0.15", default-features = false, features = [ +addr2line = { version = "0.17", default-features = false, features = [ "fallible-iterator", "std-object", "rustc-demangle", @@ -20,10 +20,10 @@ addr2line = { version = "0.15", default-features = false, features = [ anyhow = "1" colored = "2" defmt-decoder = { version = "=0.3.0", features = ["unstable"] } -gimli = { version = "0.24", default-features = false } +gimli = { version = "0.26", default-features = false } git-version = "0.3" log = "0.4" -object = { version = "0.24", default-features = false } +object = { version = "0.27", default-features = false } probe-rs = "0.12" probe-rs-rtt = "0.12" signal-hook = "0.3" @@ -32,7 +32,7 @@ structopt = "0.3" [dev-dependencies] dirs = "4" insta = "1.8" -os_pipe = "0.9" +os_pipe = "1.0" pretty_assertions = "1" rstest = "0.11" nix = "0.23" diff --git a/src/backtrace/unwind.rs b/src/backtrace/unwind.rs index f503940f..2d7982f0 100644 --- a/src/backtrace/unwind.rs +++ b/src/backtrace/unwind.rs @@ -2,7 +2,7 @@ use anyhow::{anyhow, Context as _}; use gimli::{ - BaseAddresses, CieOrFde, DebugFrame, FrameDescriptionEntry, Reader, UninitializedUnwindContext, + BaseAddresses, CieOrFde, DebugFrame, FrameDescriptionEntry, Reader, UnwindContext, UnwindSection as _, }; use probe_rs::{config::RamRegion, Core}; @@ -52,7 +52,7 @@ pub(crate) fn target(core: &mut Core, elf: &Elf, active_ram_region: &Option