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

Expose UuidParseError

This commit is contained in:
Lori Holden 2017-01-13 19:14:53 -05:00
parent 21198bd3cf
commit 1919ab8317
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/src/lib.rs
View File

@ -60,4 +60,4 @@ pub use json::SerdeError;
pub use templates::Template; pub use templates::Template;
#[cfg(feature = "uuid")] #[cfg(feature = "uuid")]
pub use uuid::UUID; pub use uuid::{UUID, UuidParseError};

10
contrib/src/uuid.rs
View File

@ -5,6 +5,8 @@ use std::str::FromStr;
use std::ops::Deref; use std::ops::Deref;
use rocket::request::FromParam; use rocket::request::FromParam;
pub use self::uuid_ext::ParseError as UuidParseError;
/// The UUID type, which implements `FromParam`. This type allows you to accept /// The UUID type, which implements `FromParam`. This type allows you to accept
/// values from the [Uuid](https://github.com/rust-lang-nursery/uuid) crate as /// values from the [Uuid](https://github.com/rust-lang-nursery/uuid) crate as
/// a dynamic parameter in your request handlers. /// a dynamic parameter in your request handlers.
@ -60,7 +62,7 @@ impl fmt::Display for UUID {
} }
impl<'a> FromParam<'a> for UUID { impl<'a> FromParam<'a> for UUID {
type Error = uuid_ext::ParseError; type Error = UuidParseError;
fn from_param(p: &'a str) -> Result<UUID, Self::Error> { fn from_param(p: &'a str) -> Result<UUID, Self::Error> {
p.parse() p.parse()
@ -68,7 +70,7 @@ impl<'a> FromParam<'a> for UUID {
} }
impl FromStr for UUID { impl FromStr for UUID {
type Err = uuid_ext::ParseError; type Err = UuidParseError;
fn from_str(s: &str) -> Result<UUID, Self::Err> { fn from_str(s: &str) -> Result<UUID, Self::Err> {
Ok(UUID(try!(s.parse()))) Ok(UUID(try!(s.parse())))
@ -92,8 +94,8 @@ impl PartialEq<uuid_ext::Uuid> for UUID {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::uuid_ext; use super::uuid_ext;
use super::{UUID, UuidParseError};
use super::FromParam; use super::FromParam;
use super::UUID;
use super::FromStr; use super::FromStr;
#[test] #[test]
@ -133,7 +135,7 @@ mod test {
let uuid_result = UUID::from_param(uuid_str); let uuid_result = UUID::from_param(uuid_str);
assert!(!uuid_result.is_ok()); assert!(!uuid_result.is_ok());
match uuid_result { match uuid_result {
Err(e) => assert_eq!(e, uuid_ext::ParseError::InvalidLength(37)), Err(e) => assert_eq!(e, UuidParseError::InvalidLength(37)),
_ => unreachable!(), _ => unreachable!(),
} }
} }