Merge branch 'main' into main

exercises/23_conversions/from_str.rs

@@ -44,10 +44,6 @@ enum ParsePersonError {
 // 6. If while extracting the name and the age something goes wrong, an error
 //    should be returned
 // If everything goes well, then return a Result of a Person object
-//
-// As an aside: `Box<dyn Error>` implements `From<&'_ str>`. This means that if
-// you want to return a string error message, you can do so via just using
-// return `Err("my error message".into())`.
 
 impl FromStr for Person {
     type Err = ParsePersonError;

exercises/README.md

@@ -17,11 +17,11 @@
 | error_handling         | §9                  |
 | generics               | §10                 |
 | traits                 | §10.2               |
-| tests                  | §11.1               |
 | lifetimes              | §10.3               |
+| tests                  | §11.1               |
 | iterators              | §13.2-4             |
-| threads                | §16.1-3             |
 | smart_pointers         | §15, §16.3          |
-| macros                 | §19.6               |
+| threads                | §16.1-3             |
+| macros                 | §19.5               |
 | clippy                 | §21.4               |
 | conversions            | n/a                 |