diff options
| author | Mo <76752051+mo8it@users.noreply.github.com> | 2024-03-29 20:03:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-29 20:03:23 +0100 |
| commit | 1a4f55e0e659f96b5f151ce657c10a3ded59105c (patch) | |
| tree | 2a2d57987fbe6e11ac1cbe08aa5edf32051c7d18 | |
| parent | 9691c3cb55484ce9676c85ad4673b38e06100303 (diff) | |
| parent | 30273a6ee5a8666c236c47340d54dabbab604f9b (diff) | |
Merge pull request #1933 from loshz/main
options1: slightly update grammar
| -rw-r--r-- | exercises/12_options/options1.rs | 9 | ||||
| -rw-r--r-- | src/verify.rs | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/exercises/12_options/options1.rs b/exercises/12_options/options1.rs index e131b48..3cbfecd 100644 --- a/exercises/12_options/options1.rs +++ b/exercises/12_options/options1.rs @@ -6,11 +6,11 @@ // I AM NOT DONE // This function returns how much icecream there is left in the fridge. -// If it's before 10PM, there's 5 pieces left. At 10PM, someone eats them +// If it's before 10PM, there's 5 scoops left. At 10PM, someone eats it // all, so there'll be no more left :( fn maybe_icecream(time_of_day: u16) -> Option<u16> { // We use the 24-hour system here, so 10PM is a value of 22 and 12AM is a - // value of 0 The Option output should gracefully handle cases where + // value of 0. The Option output should gracefully handle cases where // time_of_day > 23. // TODO: Complete the function body - remember to return an Option! ??? @@ -22,10 +22,11 @@ mod tests { #[test] fn check_icecream() { + assert_eq!(maybe_icecream(0), Some(5)); assert_eq!(maybe_icecream(9), Some(5)); - assert_eq!(maybe_icecream(10), Some(5)); - assert_eq!(maybe_icecream(23), Some(0)); + assert_eq!(maybe_icecream(18), Some(5)); assert_eq!(maybe_icecream(22), Some(0)); + assert_eq!(maybe_icecream(23), Some(0)); assert_eq!(maybe_icecream(25), None); } diff --git a/src/verify.rs b/src/verify.rs index 5275bf7..dac2562 100644 --- a/src/verify.rs +++ b/src/verify.rs @@ -196,7 +196,7 @@ fn prompt_for_completion( if no_emoji { println!("\n~*~ {success_msg} ~*~\n"); } else { - println!("\nš š {success_msg} š š\n"); + println!("\nš š {success_msg} š š\n"); } if let Some(output) = prompt_output { |
