rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Indirectly use 'Uuid::Error' for backwards compat. 

Closes #1565.
This commit is contained in:
Sergio Benitez 2021-03-09 16:55:57 -08:00
parent fd8af3a2c5
commit bbbe362740
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/lib/src/uuid.rs
View File

@ -70,6 +70,8 @@ use rocket::form::{self, FromFormField, ValueField};
#[serde(transparent)] #[serde(transparent)]
pub struct Uuid(_uuid::Uuid); pub struct Uuid(_uuid::Uuid);
pub type Error = <_uuid::Uuid as std::str::FromStr>::Err;
impl Uuid { impl Uuid {
/// Consumes the Uuid wrapper, returning the underlying `Uuid` type. /// Consumes the Uuid wrapper, returning the underlying `Uuid` type.
/// ///
@ -102,9 +104,8 @@ impl fmt::Display for Uuid {
} }
} }
impl<'a> FromParam<'a> for Uuid { impl<'a> FromParam<'a> for Uuid {
type Error = _uuid::Error; type Error = Error;
/// A value is successfully parsed if `param` is a properly formatted Uuid. /// A value is successfully parsed if `param` is a properly formatted Uuid.
/// Otherwise, an error is returned. /// Otherwise, an error is returned.
@ -121,7 +122,7 @@ impl<'v> FromFormField<'v> for Uuid {
} }
impl FromStr for Uuid { impl FromStr for Uuid {
type Err = _uuid::Error; type Err = Error;
#[inline] #[inline]
fn from_str(s: &str) -> Result<Uuid, Self::Err> { fn from_str(s: &str) -> Result<Uuid, Self::Err> {