Merge #380

380: Merge crates "elf2table" and "logger" into "decoder" r=jonas-schievink a=spookyvision Co-authored-by: Anatol Ulrich <anatol.ulrich@ferrous-systems.com>
knurling-rs · Feb 10, 2021 · 3d783b0 · 3d783b0
2 parents 4cbf0b9 + 44d1a81
commit 3d783b0
Show file tree

Hide file tree

Showing 13 changed files with 2,063 additions and 2,088 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,8 +29,6 @@ trybuild = "1.0.37"
 members = [
   ".",
   "decoder",
-  "elf2table",
-  "logger",
   "macros",
   "parser",
   "print",

diff --git a/decoder/Cargo.toml b/decoder/Cargo.toml
@@ -16,6 +16,25 @@ colored = "2.0.0"
 leb128 = "0.2.4"
 ryu = "1"
 
+
+# logger
+ansi_term = "0.12.1"
+difference = "2.0.0"
+log = { version = "0.4.13", features = ["std"] }
+
+# elf2table
+anyhow = "1.0.32"
+gimli = "0.22.0"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+
+# elf2table
+[dependencies.object]
+version = "0.21.0"
+default-features = false
+features = ["read_core", "elf", "std"]
+
+
 [build-dependencies]
 semver = "0.11.0"