From b547eeac81d4cced4f2d19fab03b44013f2c5de0 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge.aparicio@ferrous-systems.com>
Date: Fri, 28 Aug 2020 15:51:31 +0200
Subject: [PATCH] adapt to upstream changes

---
 Cargo.lock  | 9 ---------
 Cargo.toml  | 1 -
 src/main.rs | 5 ++---
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 58365d68..b114fe18 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -124,7 +124,6 @@ dependencies = [
 [[package]]
 name = "common"
 version = "0.1.0"
-source = "git+https://github.com/knurling-rs/defmt?branch=locs#eeb7391a74666d5d0e2b06415c7dde23e9eb7cc9"
 
 [[package]]
 name = "crc32fast"
@@ -148,7 +147,6 @@ dependencies = [
 [[package]]
 name = "decoder"
 version = "0.1.0"
-source = "git+https://github.com/knurling-rs/defmt?branch=locs#eeb7391a74666d5d0e2b06415c7dde23e9eb7cc9"
 dependencies = [
  "byteorder",
  "colored",
@@ -161,7 +159,6 @@ dependencies = [
 [[package]]
 name = "defmt-parser"
 version = "0.1.0"
-source = "git+https://github.com/knurling-rs/defmt?branch=locs#eeb7391a74666d5d0e2b06415c7dde23e9eb7cc9"
 
 [[package]]
 name = "derivative"
@@ -183,7 +180,6 @@ checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
 [[package]]
 name = "elf2table"
 version = "0.1.0"
-source = "git+https://github.com/knurling-rs/defmt?branch=locs#eeb7391a74666d5d0e2b06415c7dde23e9eb7cc9"
 dependencies = [
  "anyhow",
  "decoder",
@@ -473,10 +469,6 @@ name = "object"
 version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37fd5004feb2ce328a52b0b3d01dbf4ffff72583493900ed15f22d4111c51693"
-dependencies = [
- "flate2",
- "wasmparser",
-]
 
 [[package]]
 name = "pkg-config"
@@ -558,7 +550,6 @@ dependencies = [
  "env_logger",
  "gimli 0.22.0",
  "log",
- "object 0.21.1",
  "probe-rs",
  "probe-rs-rtt",
  "rustc-demangle",
diff --git a/Cargo.toml b/Cargo.toml
index ade3fe0f..0e77602f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,7 +25,6 @@ probe-rs-rtt = "0.3.0"
 rustc-demangle = "0.1.16"
 structopt = "0.3.15"
 xmas-elf = "0.7.0"
-object = "0.21.1"
 
 [features]
 defmt = ["elf2table", "decoder"]
diff --git a/src/main.rs b/src/main.rs
index 37f4d78e..9ee1fd01 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -68,11 +68,10 @@ fn notmain() -> Result<i32, anyhow::Error> {
     let bytes = fs::read(elf_path)?;
     // TODO switch this line from xmas-elf to object
     let elf = ElfFile::new(&bytes).map_err(|s| anyhow!("{}", s))?;
-    let obj = object::File::parse(&bytes)?;
 
     #[cfg(feature = "defmt")]
     let (table, locs) = {
-        let table = elf2table::parse(&obj)?;
+        let table = elf2table::parse(&bytes)?;
 
         if table.is_none() && opts.defmt {
             bail!(".`.defmt` section not found")
@@ -81,7 +80,7 @@ fn notmain() -> Result<i32, anyhow::Error> {
         }
 
         let locs = if opts.defmt {
-            let locs = elf2table::get_locations(&obj)?;
+            let locs = elf2table::get_locations(&bytes)?;
 
             if !table.as_ref().unwrap().is_empty() && locs.is_empty() {
                 bail!("DWARF file location info not found; compile your program with `debug = 2`")