From 0b63284c7b8b137cb2536ff38482e6f6944b5d89 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 10:29:52 +0000 Subject: [PATCH 1/3] Update Rust crate addr2line to 0.22 --- 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 2dc09f65..4c3f41f9 100644 --- a/agb-debug/Cargo.toml +++ b/agb-debug/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/agbrs/agb" [dependencies] anyhow = "1" clap = { version = "4", features = ["derive"] } -addr2line = { version = "0.21", default-features = false, features = [ +addr2line = { version = "0.22", default-features = false, features = [ "rustc-demangle", "std-object", ] } From 66e55890e2aaf17f8f0331c2e857b44f5d6c012f Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Sat, 13 Apr 2024 15:56:00 +0100 Subject: [PATCH 2/3] Only need 1 lifetime here --- agb-debug/src/load_dwarf.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agb-debug/src/load_dwarf.rs b/agb-debug/src/load_dwarf.rs index 6662f231..12d3500a 100644 --- a/agb-debug/src/load_dwarf.rs +++ b/agb-debug/src/load_dwarf.rs @@ -67,7 +67,7 @@ fn load_from_object<'file>( endian: Endian, ) -> Result, gimli::Error> where - O: object::Object<'data, 'file>, + O: object::Object<'data>, Endian: gimli::Endianity, { use object::ObjectSection; From 7f493e922e70b4d3bbb3cb36fe6196a4e711c8ab Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Sat, 13 Apr 2024 15:58:30 +0100 Subject: [PATCH 3/3] Simplify the declaration a little --- agb-debug/src/load_dwarf.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/agb-debug/src/load_dwarf.rs b/agb-debug/src/load_dwarf.rs index 12d3500a..394e5e57 100644 --- a/agb-debug/src/load_dwarf.rs +++ b/agb-debug/src/load_dwarf.rs @@ -61,13 +61,12 @@ fn load_from_object<'file>( gimli::RunTimeEndian::Big }; - fn load_section<'data: 'file, 'file, O, Endian>( + fn load_section<'data, Endian>( id: gimli::SectionId, - file: &'file O, + file: &impl object::Object<'data>, endian: Endian, ) -> Result, gimli::Error> where - O: object::Object<'data>, Endian: gimli::Endianity, { use object::ObjectSection;