commit 804609030bedec8e6fb3f0cd300bcfce3fc844f3
author Alphan Ulusoy <alphan@google.com> Mon Jan 03 13:52:38 2022 -0500
committer Alphan Ulusoy <alphan@google.com> Wed Jan 12 14:05:14 2022 -0500
tree e1681fe9b7434c40e02b7c8fa00a5fb6fa42f4dc
parent dbbb1fef257ff6a246a139bee6d634f5038d40a0

[opentitantool] Support different error types in `ParseInt`

`ParseInt` currently returns `std::num::ParseIntError` which cannot be
constructed externally. This change introduces a new enum
`ParseIntError` to be able to transparently forward different enums.

Signed-off-by: Alphan Ulusoy <alphan@google.com>

sw/host/opentitanlib/src/util/parse_int.rs

diff --git a/sw/host/opentitanlib/src/util/parse_int.rs b/sw/host/opentitanlib/src/util/parse_int.rs
index 6c2c8cf..cb8fd1c 100644
--- a/sw/host/opentitanlib/src/util/parse_int.rs
+++ b/sw/host/opentitanlib/src/util/parse_int.rs
@@ -2,7 +2,14 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
-use std::num::ParseIntError;
+use std::num;
+use thiserror::Error;
+
+#[derive(Error, Debug, Clone, Eq, PartialEq)]
+pub enum ParseIntError {
+    #[error(transparent)]
+    ParseIntError(#[from] num::ParseIntError),
+}
 
 /// Trait for parsing integers.
 ///
@@ -11,7 +18,9 @@
 /// A leading `+` or `-` is permitted.  Any string parsed by `strtol(3)` or `strtoul(3)`
 /// will be parsed successfully.
 pub trait ParseInt: Sized {
-    fn from_str_radix(src: &str, radix: u32) -> Result<Self, ParseIntError>;
+    type FromStrRadixErr: Into<ParseIntError>;
+
+    fn from_str_radix(src: &str, radix: u32) -> Result<Self, Self::FromStrRadixErr>;
 
     fn from_str(src: &str) -> Result<Self, ParseIntError> {
         let (val, negative) = if let Some(v) = src.strip_prefix('-') {
@@ -33,9 +42,9 @@
         if negative {
             let mut digits = digits.to_string();
             digits.insert(0, '-');
-            Self::from_str_radix(&digits, radix)
+            Self::from_str_radix(&digits, radix).map_err(Self::FromStrRadixErr::into)
         } else {
-            Self::from_str_radix(digits, radix)
+            Self::from_str_radix(digits, radix).map_err(Self::FromStrRadixErr::into)
         }
     }
 }
@@ -43,7 +52,9 @@
 macro_rules! impl_parse_int {
     ($ty:ident) => {
         impl ParseInt for $ty {
-            fn from_str_radix(src: &str, radix: u32) -> Result<Self, ParseIntError> {
+            type FromStrRadixErr = num::ParseIntError;
+
+            fn from_str_radix(src: &str, radix: u32) -> Result<Self, Self::FromStrRadixErr> {
                 $ty::from_str_radix(src, radix)
             }
         }