From 2ac49ace06bf827f5ff2009adc9197ac4e1e35e2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 26 May 2024 07:04:06 +0000 Subject: [PATCH 1/2] Update Rust crate addr2line to 0.23 --- agb-debug/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agb-debug/Cargo.toml b/agb-debug/Cargo.toml index 0b0f4e3a..9ec21789 100644 --- a/agb-debug/Cargo.toml +++ b/agb-debug/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/agbrs/agb" [dependencies] thiserror = "1" clap = { version = "4", features = ["derive"] } -addr2line = { version = "0.22", default-features = false, features = [ +addr2line = { version = "0.23", default-features = false, features = [ "rustc-demangle", "std-object", ] } From 587e3cb521a455466563259150f57a90db358df0 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Mon, 27 May 2024 09:58:23 +0100 Subject: [PATCH 2/2] Fix build errors by importing the crates manually --- agb-debug/Cargo.toml | 8 ++++---- agb-debug/src/load_dwarf.rs | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/agb-debug/Cargo.toml b/agb-debug/Cargo.toml index 9ec21789..b7f650e9 100644 --- a/agb-debug/Cargo.toml +++ b/agb-debug/Cargo.toml @@ -8,12 +8,12 @@ description = "CLI utility to convert agb stack trace dumps into human readable repository = "https://github.com/agbrs/agb" [dependencies] +addr2line = { version = "0.23", default-features = false, features = ["rustc-demangle"] } +gimli = { version = "0.30", default-features = false, features = ["endian-reader", "std"] } +object = { version = "0.36", default-features = false, features = ["read"] } + thiserror = "1" clap = { version = "4", features = ["derive"] } -addr2line = { version = "0.23", default-features = false, features = [ - "rustc-demangle", - "std-object", -] } colored = "2" rmp-serde = "1" lz4_flex = "0.11" diff --git a/agb-debug/src/load_dwarf.rs b/agb-debug/src/load_dwarf.rs index d4b13ab1..4f81bdb2 100644 --- a/agb-debug/src/load_dwarf.rs +++ b/agb-debug/src/load_dwarf.rs @@ -1,9 +1,7 @@ use std::{borrow::Cow, collections::HashMap, io::Cursor, rc::Rc}; -use addr2line::{ - gimli, - object::{self, Object}, -}; +use addr2line::gimli; +use object::Object; use thiserror::Error; #[derive(Debug, Error)]