adapt to upstream changes

knurling-rs · Aug 28, 2020 · b547eea · b547eea
1 parent 96489ef
commit b547eea
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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`")