fix(*): FromStr now returns a Result, not an Option.

nickel-org · Feb 4, 2015 · ce33ef2 · ce33ef2
1 parent 91957fb
commit ce33ef2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/examples/example.rs b/examples/example.rs
@@ -1,4 +1,4 @@
-#![feature(collections, core, io)]
+#![feature(core, io)]
 
 extern crate "rustc-serialize" as rustc_serialize;
 extern crate nickel;

diff --git a/src/mimes.rs b/src/mimes.rs
@@ -30,14 +30,15 @@ macro_rules! mimes {
         }
 
         impl FromStr for MediaType {
-            fn from_str(s: &str) -> Option<MediaType> {
+            type Err = &'static str;
+            fn from_str(s: &str) -> Result<MediaType, &'static str> {
                 match s {
                     $(
                         $(
-                            $as_s => Some(MediaType::$name)
+                            $as_s => Ok(MediaType::$name)
                         ),*
                     ),*,
-                    _ => None
+                    _ => Err("Not a valid MediaType.")
                 }
             }
         }

diff --git a/src/response.rs b/src/response.rs
@@ -106,7 +106,7 @@ impl<'a, 'b> Response<'a, 'b> {
         self.origin.headers.content_length = None;
 
         self.origin.headers.content_type = path.extension_str()
-                                               .and_then(|s| s.parse())
+                                               .and_then(|s| s.parse().ok())
                                                .map(mimes::get_media_type);
         self.origin.headers.server = Some(String::from_str("Nickel"));
         copy(&mut file, self.origin)
@@ -157,7 +157,7 @@ impl<'a, 'b> Response<'a, 'b> {
 #[test]
 fn matches_content_type () {
     let path = &Path::new("test.txt");
-    let content_type = path.extension_str().and_then(|s| s.parse());
+    let content_type = path.extension_str().and_then(|s| s.parse().ok());
 
     assert_eq!(content_type, Some(mimes::MediaType::Txt));
     let content_type = content_type.map(mimes::get_media_type).unwrap();