fix(rustup): update FromStr

Signed-off-by: Peter Atashian <retep998@gmail.com>
This commit is contained in:
Peter Atashian
2015-02-03 17:14:11 -05:00
committed by Sean McArthur
parent c983ebf3ce
commit 742081c8cf
18 changed files with 90 additions and 79 deletions

View File

@@ -68,11 +68,12 @@ impl Method {
}
impl FromStr for Method {
fn from_str(s: &str) -> Option<Method> {
type Err = ();
fn from_str(s: &str) -> Result<Method, ()> {
if s == "" {
None
Err(())
} else {
Some(match s {
Ok(match s {
"OPTIONS" => Options,
"GET" => Get,
"POST" => Post,
@@ -127,8 +128,8 @@ mod tests {
#[test]
fn test_from_str() {
assert_eq!(Some(Get), FromStr::from_str("GET"));
assert_eq!(Some(Extension("MOVE".to_string())),
assert_eq!(Ok(Get), FromStr::from_str("GET"));
assert_eq!(Ok(Extension("MOVE".to_string())),
FromStr::from_str("MOVE"));
}