From 726455a0f352b03c4f7e0f684ae0ac79180e9937 Mon Sep 17 00:00:00 2001
From: Johann Hemmann <johann.hemmann@code.berlin>
Date: Tue, 29 Jun 2021 17:32:42 +0200
Subject: [PATCH 1/3] `Cargo.toml`: Bump `gimli`, `object`

---
 decoder/Cargo.toml           | 11 ++---------
 decoder/src/elf2table/mod.rs |  4 ++--
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/decoder/Cargo.toml b/decoder/Cargo.toml
index 4bffd17f..31c36422 100644
--- a/decoder/Cargo.toml
+++ b/decoder/Cargo.toml
@@ -16,7 +16,6 @@ colored = "2.0.0"
 leb128 = "0.2.4"
 ryu = "1"
 
-
 # logger
 ansi_term = "0.12.1"
 difference = "2.0.0"
@@ -24,17 +23,11 @@ log = { version = "0.4.14", features = ["std"] }
 
 # elf2table
 anyhow = "1.0"
-gimli = "0.23"
+gimli = { version = "0.24" }
+object = { version = "0.25", default-features = false, features = ["read_core", "elf", "std"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 
-# elf2table
-[dependencies.object]
-version = "0.23"
-default-features = false
-features = ["read_core", "elf", "std"]
-
-
 [build-dependencies]
 semver = "1.0"
 
diff --git a/decoder/src/elf2table/mod.rs b/decoder/src/elf2table/mod.rs
index 6acd7b44..38fb972f 100644
--- a/decoder/src/elf2table/mod.rs
+++ b/decoder/src/elf2table/mod.rs
@@ -212,8 +212,8 @@ pub fn get_locations(elf: &[u8], table: &Table) -> Result<Locations, anyhow::Err
     };
     let load_section_sup = |_| Ok(Cow::Borrowed(&[][..]));
 
-    let dwarf_cow =
-        gimli::Dwarf::<Cow<[u8]>>::load::<_, _, anyhow::Error>(&load_section, &load_section_sup)?;
+    let mut dwarf_cow = gimli::Dwarf::<Cow<[u8]>>::load::<_, anyhow::Error>(&load_section)?;
+    dwarf_cow.load_sup::<_, anyhow::Error>(&load_section_sup)?;
 
     let borrow_section: &dyn for<'a> Fn(
         &'a Cow<[u8]>,

From 9f4aa8e6732632217cc74a8e7a3737d2159b845a Mon Sep 17 00:00:00 2001
From: Johann Hemmann <johann.hemmann@code.berlin>
Date: Tue, 29 Jun 2021 17:40:38 +0200
Subject: [PATCH 2/3] `Cargo.toml`: Disable default-features for `gimli`

---
 decoder/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decoder/Cargo.toml b/decoder/Cargo.toml
index 31c36422..4b030fe0 100644
--- a/decoder/Cargo.toml
+++ b/decoder/Cargo.toml
@@ -23,7 +23,7 @@ log = { version = "0.4.14", features = ["std"] }
 
 # elf2table
 anyhow = "1.0"
-gimli = { version = "0.24" }
+gimli = { version = "0.24", default-features = false, features = ["read", "std"] }
 object = { version = "0.25", default-features = false, features = ["read_core", "elf", "std"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

From 31daf934435d59f0d4eec594487d069661f1d9ed Mon Sep 17 00:00:00 2001
From: Johann Hemmann <johann.hemmann@code.berlin>
Date: Tue, 29 Jun 2021 17:41:54 +0200
Subject: [PATCH 3/3] `Cargo.toml`: Don't specify patch version

---
 decoder/Cargo.toml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/decoder/Cargo.toml b/decoder/Cargo.toml
index 4b030fe0..e2370ecf 100644
--- a/decoder/Cargo.toml
+++ b/decoder/Cargo.toml
@@ -12,14 +12,14 @@ version = "0.2.2"
 [dependencies]
 defmt-parser = { path = "../parser", features = ["unstable"], version = "=0.2.2" }
 byteorder = "1"
-colored = "2.0.0"
-leb128 = "0.2.4"
+colored = "2.0"
+leb128 = "0.2"
 ryu = "1"
 
 # logger
-ansi_term = "0.12.1"
-difference = "2.0.0"
-log = { version = "0.4.14", features = ["std"] }
+ansi_term = "0.12"
+difference = "2.0"
+log = { version = "0.4", features = ["std"] }
 
 # elf2table
 anyhow = "1.0"