Merge #620

620: Tidy up r=justahero a=Urhengulas

* decoder: Drop unused leb128 dependency
* defmt: Drop unused fn zigzag_encode
* decoder: Drop barely used dependency ansi_term
* Drop old defmt-* features 
* `defmt`: Drop `mod leb` (it is not used anymore) 

Co-authored-by: Johann Hemmann <johann.hemmann@code.berlin>

decoder/Cargo.toml

@@ -13,11 +13,9 @@ version = "0.2.2"
 defmt-parser = { path = "../parser", features = ["unstable"], version = "=0.2.2" }
 byteorder = "1"
 colored = "2.0"
-leb128 = "0.2"
 ryu = "1"
 
 # logger
-ansi_term = "0.12"
 difference = "2.0"
 log = { version = "0.4", features = ["std"] }
 

decoder/src/log.rs

@@ -7,7 +7,6 @@
 //! [`defmt`]: https://crates.io/crates/defmt
 
 use crate::Frame;
-use ansi_term::Colour;
 use colored::{Color, Colorize};
 use difference::{Changeset, Difference};
 use log::{Level, Log, Metadata, Record};
@@ -204,9 +203,6 @@ fn color_diff(text: String) -> String {
             && right.starts_with(RIGHT_START)
             && right.ends_with(END)
         {
-            const DARK_RED: Colour = Colour::Fixed(52);
-            const DARK_GREEN: Colour = Colour::Fixed(22);
-
             // `defmt::assert_eq!` output
             let left = &left[LEFT_START.len()..left.len() - END.len()];
             let right = &right[RIGHT_START.len()..right.len() - END.len()];
@@ -232,7 +228,7 @@ fn color_diff(text: String) -> String {
                     }
                     Difference::Add(_) => continue,
                     Difference::Rem(s) => {
-                        write!(buf, "{}", Colour::Red.on(DARK_RED).bold().paint(s)).ok();
+                        write!(buf, "{}", s.red().bold()).ok();
                     }
                 }
             }
@@ -246,7 +242,7 @@ fn color_diff(text: String) -> String {
                     }
                     Difference::Rem(_) => continue,
                     Difference::Add(s) => {
-                        write!(buf, "{}", Colour::Green.on(DARK_GREEN).bold().paint(s)).ok();
+                        write!(buf, "{}", s.green().bold()).ok();
                     }
                 }
             }

firmware/defmt-test/Cargo.toml

@@ -15,12 +15,3 @@ cortex-m = "0.7.2"
 cortex-m-rt = "0.7.0"
 defmt = { version = "0.2.2", path = "../../defmt" }
 defmt-test-macros = { version = "=0.2.1", path = "macros" }
-
-[features]
-defmt-default = []
-defmt-trace = []
-defmt-debug = []
-defmt-info = []
-defmt-warn = []
-defmt-error = []
-default = ["defmt-trace"] # enable everything

firmware/qemu/Cargo.toml

@@ -21,13 +21,6 @@ alloc-cortex-m = { version = "0.4.1", optional = true }
 linked_list_allocator = { version = "0.9.0", optional = true }
 
 [features]
-defmt-default = [] # log at INFO, or TRACE, level and up
-defmt-trace = []   # log at TRACE level and up
-defmt-debug = []   # log at DEBUG level and up
-defmt-info = []    # log at INFO level and up
-defmt-warn = []    # log at WARN level and up
-defmt-error = []   # log at ERROR level
-default = ["defmt-default"]
 alloc = ["defmt/alloc", "alloc-cortex-m", "linked_list_allocator/const_mut_refs"]
 
 [[bin]]