Rust update: Fix tests

examples/client.rs

@@ -123,7 +123,7 @@ fn main() {
         },
         // port
         match matches.opt_str("p") {
-            Some(port) => from_str::<Port>(port.as_slice()).unwrap(),
+            Some(port) => port.as_slice().parse::<Port>().unwrap(),
             None => 25
         },
         // my hostname

src/extension.rs

@@ -118,12 +118,12 @@ mod test {
 
     #[test]
     fn test_from_str() {
-        assert_eq!(from_str::<Extension>("8BITMIME"), Some(Extension::EightBitMime));
-        assert_eq!(from_str::<Extension>("SIZE 42"), Some(Extension::Size(42)));
-        assert_eq!(from_str::<Extension>("SIZ 42"), None);
-        assert_eq!(from_str::<Extension>("SIZE 4a2"), None);
+        assert_eq!("8BITMIME".parse::<Extension>(), Some(Extension::EightBitMime));
+        assert_eq!("SIZE 42".parse::<Extension>(), Some(Extension::Size(42)));
+        assert_eq!("SIZ 42".parse::<Extension>(), None);
+        assert_eq!("SIZE 4a2".parse::<Extension>(), None);
         // TODO: accept trailing spaces ?
-        assert_eq!(from_str::<Extension>("SIZE 42 "), None);
+        assert_eq!("SIZE 42 ".parse::<Extension>(), None);
     }
 
     #[test]

src/response.rs

@@ -81,41 +81,41 @@ mod test {
 
     #[test]
     fn test_from_str() {
-        assert_eq!(from_str::<Response>("200 response message"),
+        assert_eq!("200 response message".parse::<Response>(),
             Some(Response{
                 code: 200,
                 message: Some("response message".to_string())
             })
         );
-        assert_eq!(from_str::<Response>("200-response message"),
+        assert_eq!("200-response message".parse::<Response>(),
             Some(Response{
                 code: 200,
                 message: Some("response message".to_string())
             })
         );
-        assert_eq!(from_str::<Response>("200"),
+        assert_eq!("200".parse::<Response>(),
             Some(Response{
                 code: 200,
                 message: None
             })
         );
-        assert_eq!(from_str::<Response>("200 "),
+        assert_eq!("200 ".parse::<Response>(),
             Some(Response{
                 code: 200,
                 message: None
             })
         );
-        assert_eq!(from_str::<Response>("200-response\r\nmessage"),
+        assert_eq!("200-response\r\nmessage".parse::<Response>(),
             Some(Response{
                 code: 200,
                 message: Some("response\r\nmessage".to_string())
             })
         );
-        assert_eq!(from_str::<Response>("2000response message"), None);
-        assert_eq!(from_str::<Response>("20a response message"), None);
-        assert_eq!(from_str::<Response>("20 "), None);
-        assert_eq!(from_str::<Response>("20"), None);
-        assert_eq!(from_str::<Response>("2"), None);
-        assert_eq!(from_str::<Response>(""), None);
+        assert_eq!("2000response message".parse::<Response>(), None);
+        assert_eq!("20a response message".parse::<Response>(), None);
+        assert_eq!("20 ".parse::<Response>(), None);
+        assert_eq!("20".parse::<Response>(), None);
+        assert_eq!("2".parse::<Response>(), None);
+        assert_eq!("".parse::<Response>(), None);
     }
 }