Move helper function
Move the `strip_hex_prefix` helper function to below where it is called. Note that I was the original author of this helper so there is no excuse for it being above - bad Tobin no biscuit.
This commit is contained in:
parent
dca054c680
commit
1269722770
|
@ -88,17 +88,6 @@ pub fn int<T: Integer, S: AsRef<str> + Into<String>>(s: S) -> Result<T, ParseInt
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Strips the hex prefix off `s` if one is present.
|
|
||||||
pub(crate) fn strip_hex_prefix(s: &str) -> &str {
|
|
||||||
if let Some(stripped) = s.strip_prefix("0x") {
|
|
||||||
stripped
|
|
||||||
} else if let Some(stripped) = s.strip_prefix("0X") {
|
|
||||||
stripped
|
|
||||||
} else {
|
|
||||||
s
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parses a u32 from a hex string.
|
/// Parses a u32 from a hex string.
|
||||||
///
|
///
|
||||||
/// Input string may or may not contain a `0x` prefix.
|
/// Input string may or may not contain a `0x` prefix.
|
||||||
|
@ -111,6 +100,17 @@ pub fn hex_u32<S: AsRef<str> + Into<String>>(s: S) -> Result<u32, ParseIntError>
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Strips the hex prefix off `s` if one is present.
|
||||||
|
pub(crate) fn strip_hex_prefix(s: &str) -> &str {
|
||||||
|
if let Some(stripped) = s.strip_prefix("0x") {
|
||||||
|
stripped
|
||||||
|
} else if let Some(stripped) = s.strip_prefix("0X") {
|
||||||
|
stripped
|
||||||
|
} else {
|
||||||
|
s
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Implements `TryFrom<$from> for $to` using `parse::int`, mapping the output using infallible
|
/// Implements `TryFrom<$from> for $to` using `parse::int`, mapping the output using infallible
|
||||||
/// conversion function `fn`.
|
/// conversion function `fn`.
|
||||||
#[macro_export]
|
#[macro_export]
|
||||||
|
|
Loading…
Reference in New Issue