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

bors · bors · commit 700b236f4d25 · 2020-03-11T15:06:23.000Z
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).
diff --git 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);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -70,4 +70,11 @@ mod tests {`
`70`	`70`	`assert_eq!(p.name, "Mark");`
`71`	`71`	`assert_eq!(p.age, 20);`
`72`	`72`	`}`
	`73`	`+ #[test]`
	`74`	`+ fn test_bad_age() {`
	`75`	`+ // Test that "Mark.twenty" will return the default person due to an error in parsing age`
	`76`	`+ let p = Person::from("Mark,twenty");`
	`77`	`+ assert_eq!(p.name, "John");`
	`78`	`+ assert_eq!(p.age, 30);`
	`79`	`+ }`
`73`	`80`	`}`