Auto merge of #284 - sl4m:update-from-into-ex, r=fmoko

Adds additional test to meet exercise rules

This PR adds an additional test to meet this exercise [rule](https://github.com/rust-lang/rustlings/blob/master/exercises/conversions/from_into.rs#L33).

1 files changed, 7 insertions, 0 deletions

diff --git a/exercises/conversions/from_into.rs b/exercises/conversions/from_into.rs
index 666f234..58b860e 100644
--- a/exercises/conversions/from_into.rs
+++ b/exercises/conversions/from_into.rs
@@ -70,4 +70,11 @@ mod tests {
         assert_eq!(p.name, "Mark");
         assert_eq!(p.age, 20);
     }
+    #[test]
+    fn test_bad_age() {
+        // Test that "Mark.twenty" will return the default person due to an error in parsing age
+        let p = Person::from("Mark,twenty");
+        assert_eq!(p.name, "John");
+        assert_eq!(p.age, 30);
+    }
 }