From 77a1e85504f63205f00480bc38316f411c6f11d1 Mon Sep 17 00:00:00 2001 From: Trevor Spiteri Date: Thu, 22 Oct 2020 11:17:56 +0200 Subject: [PATCH] expose error returned by impl of Num::from_str_radix --- src/impl_num_traits.rs | 8 ++++---- src/lib.rs | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/impl_num_traits.rs b/src/impl_num_traits.rs index 0108219..a5a4966 100644 --- a/src/impl_num_traits.rs +++ b/src/impl_num_traits.rs @@ -43,7 +43,7 @@ use num_traits::{ /// An error which can be returned when parsing a fixed-point number /// with a given radix. -pub enum FixedFromStrRadixError { +pub enum RadixParseFixedError { /// The radix is not 2, 8, 10 or 16. UnsupportedRadix, /// The string could not be parsed as a fixed-point number. @@ -88,7 +88,7 @@ macro_rules! impl_traits { where Frac: IsLessOrEqual<$OneMaxFrac, Output = True>, { - type FromStrRadixErr = FixedFromStrRadixError; + type FromStrRadixErr = RadixParseFixedError; #[inline] fn from_str_radix(str: &str, radix: u32) -> Result { @@ -97,9 +97,9 @@ macro_rules! impl_traits { 8 => Self::from_str_octal(str), 10 => str.parse(), 16 => Self::from_str_hex(str), - _ => return Err(FixedFromStrRadixError::UnsupportedRadix), + _ => return Err(RadixParseFixedError::UnsupportedRadix), } - .map_err(FixedFromStrRadixError::ParseFixedError) + .map_err(RadixParseFixedError::ParseFixedError) } } diff --git a/src/lib.rs b/src/lib.rs index daacd4c..f197830 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -321,6 +321,8 @@ mod unwrapped; mod wide_div; mod wrapping; +#[cfg(feature = "num-traits")] +pub use crate::impl_num_traits::RadixParseFixedError; #[cfg(feature = "unwrapped")] pub use crate::unwrapped::Unwrapped; use crate::{