summaryrefslogtreecommitdiff
path: root/exercises
diff options
context:
space:
mode:
authorDan <danbond@protonmail.com>2024-03-29 18:29:38 +0000
committerGitHub <noreply@github.com>2024-03-29 18:29:38 +0000
commit30273a6ee5a8666c236c47340d54dabbab604f9b (patch)
tree2a2d57987fbe6e11ac1cbe08aa5edf32051c7d18 /exercises
parenteb952a480d2dabcafa8b55e1a89872c9b5e4194b (diff)
parent9691c3cb55484ce9676c85ad4673b38e06100303 (diff)
Merge branch 'main' into main
Diffstat (limited to 'exercises')
-rw-r--r--exercises/23_conversions/from_str.rs4
-rw-r--r--exercises/README.md6
2 files changed, 3 insertions, 7 deletions
diff --git a/exercises/23_conversions/from_str.rs b/exercises/23_conversions/from_str.rs
index 34472c3..e209347 100644
--- a/exercises/23_conversions/from_str.rs
+++ b/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;
diff --git a/exercises/README.md b/exercises/README.md
index c7effa9..237f2f1 100644
--- a/exercises/README.md
+++ b/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 |