Remove the dependency on parse_int in favour of from_str_radix (#756)

* Remove the dependency on `parse_int` in favour of `from_str_radix`

* Add a unit test for the `parse_u32` function

Author: jessebraham

Cargo.lock

@@ -43,7 +43,6 @@ indicatif       = { version = "0.17.9", optional = true }
 log             = "0.4.22"
 md-5            = "0.10.6"
 miette          = "7.4.0"
-parse_int       = { version = "0.6.0", optional = true }
 regex           = { version = "1.11.1", optional = true }
 serde           = { version = "1.0.217", features = ["derive"] }
 serialport      = { version = "4.7.0", default-features = false, optional = true }
@@ -73,7 +72,6 @@ cli = [
     "dep:directories",
     "dep:env_logger",
     "dep:indicatif",
-    "dep:parse_int",
     "dep:toml",
     "dep:update-informer",
     "miette/fancy",

espflash/Cargo.toml

@@ -290,9 +290,15 @@ pub struct ChecksumMd5Args {
     connect_args: ConnectArgs,
 }
 
-/// Parses an integer, in base-10 or hexadecimal format, into a [u32].
+/// Parses an integer, in base-10 or hexadecimal format, into a [u32]
 pub fn parse_u32(input: &str) -> Result<u32, ParseIntError> {
-    parse_int::parse(input)
+    let (s, radix) = if input.len() > 2 && matches!(&input[0..2], "0x" | "0X") {
+        (&input[2..], 16)
+    } else {
+        (input, 10)
+    };
+
+    u32::from_str_radix(s, radix)
 }
 
 /// Select a serial port and establish a connection with a target device
@@ -861,7 +867,7 @@ pub fn make_flash_data(
 mod test {
     use clap::Parser;
 
-    use crate::cli::FlashArgs;
+    use super::*;
 
     #[derive(Parser)]
     struct TestParser {
@@ -876,4 +882,21 @@ mod test {
         let parser = TestParser::parse_from(iter);
         assert_eq!(parser.args.image.partition_table_offset, Some(0x8000));
     }
+
+    #[test]
+    fn test_parse_u32() {
+        // Hex
+        assert_eq!(parse_u32("0x1"), Ok(0x1));
+        assert_eq!(parse_u32("0X1234"), Ok(0x1234));
+        assert_eq!(parse_u32("0xaBcD"), Ok(0xabcd));
+        // Decimal
+        assert_eq!(parse_u32("1234"), Ok(1234));
+        assert_eq!(parse_u32("0"), Ok(0));
+        // Errors
+        assert!(parse_u32("").is_err());
+        assert!(parse_u32("0x").is_err());
+        assert!(parse_u32("0xg").is_err());
+        assert!(parse_u32("-123").is_err());
+        assert!(parse_u32("12.34").is_err());
+    }
 }

espflash/src/cli/mod.rs

@@ -16,7 +16,7 @@ pub trait InputParser {
 }
 
 // Pattern to much a function address in serial output.
-static RE_FN_ADDR: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"0x[[:xdigit:]]{8}").unwrap());
+static RE_FN_ADDR: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"0[xX][[:xdigit:]]{8}").unwrap());
 
 fn resolve_addresses(
     symbols: &Symbols<'_>,
@@ -30,7 +30,7 @@ fn resolve_addresses(
         // Since our regular expression already confirms that this is a correctly
         // formatted hex literal, we can (fairly) safely assume that it will parse
         // successfully into an integer.
-        let addr = parse_int::parse::<u64>(matched).unwrap();
+        let addr = u64::from_str_radix(&matched[2..], 16).unwrap();
 
         let name = symbols.get_name(addr);
         let location = symbols.get_location(addr);