Skip to content
This repository has been archived by the owner on Jan 30, 2024. It is now read-only.

Update dependencies #286

Merged
merged 2 commits into from
Nov 26, 2021
Merged

Update dependencies #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5d5bfd
Update dependencies
jonas-schievink Nov 25, 2021
ef076ab
Merge branch 'main' into update-deps
jonathanpallant Nov 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 9 additions & 17 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/backtrace/unwind.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -52,7 +52,7 @@ pub(crate) fn target(core: &mut Core, elf: &Elf, active_ram_region: &Option<RamR
let sp = unwrap_or_return_output!(core.read_core_reg(registers::SP));
let lr = unwrap_or_return_output!(core.read_core_reg(registers::LR));
let base_addresses = BaseAddresses::default();
let mut unwind_context = UninitializedUnwindContext::new();
let mut unwind_context = UnwindContext::new();
let mut registers = Registers::new(lr, sp, core);

loop {
Expand Down