summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--exercises/error_handling/errors1.rs8
-rw-r--r--info.toml6
2 files changed, 4 insertions, 10 deletions
diff --git a/exercises/error_handling/errors1.rs b/exercises/error_handling/errors1.rs
index 243622c..c417fb2 100644
--- a/exercises/error_handling/errors1.rs
+++ b/exercises/error_handling/errors1.rs
@@ -1,9 +1,8 @@
// errors1.rs
// This function refuses to generate text to be printed on a nametag if
// you pass it an empty string. It'd be nicer if it explained what the problem
-// was, instead of just sometimes returning `None`. The 2nd test currently
-// does not compile or pass, but it illustrates the behavior we would like
-// this function to have.
+// was, instead of just sometimes returning `None`. Thankfully, Rust has a similar
+// construct to `Option` that can be used to express error conditions. Let's use it!
// Execute `rustlings hint errors1` for hints!
// I AM NOT DONE
@@ -21,9 +20,6 @@ pub fn generate_nametag_text(name: String) -> Option<String> {
mod tests {
use super::*;
- // This test passes initially if you comment out the 2nd test.
- // You'll need to update what this test expects when you change
- // the function under test!
#[test]
fn generates_nametag_text_for_a_nonempty_name() {
assert_eq!(
diff --git a/info.toml b/info.toml
index 9430a16..56fa7ec 100644
--- a/info.toml
+++ b/info.toml
@@ -490,7 +490,7 @@ name = "errors1"
path = "exercises/error_handling/errors1.rs"
mode = "test"
hint = """
-`Err` is one of the variants of `Result`, so what the 2nd test is saying
+`Ok` and `Err` are one of the variants of `Result`, so what the tests are saying
is that `generate_nametag_text` should return a `Result` instead of an
`Option`.
@@ -500,9 +500,7 @@ To make this change, you'll need to:
- change the body of the function to return `Ok(stuff)` where it currently
returns `Some(stuff)`
- change the body of the function to return `Err(error message)` where it
- currently returns `None`
- - change the first test to expect `Ok(stuff)` where it currently expects
- `Some(stuff)`."""
+ currently returns `None`"""
[[exercises]]
name = "errors2"