mirror of
https://github.com/rust-lang/rustlings.git
synced 2024-12-26 00:00:03 +03:00
Merge pull request #1933 from loshz/main
options1: slightly update grammar
This commit is contained in:
commit
1a4f55e0e6
|
@ -6,11 +6,11 @@
|
||||||
// I AM NOT DONE
|
// I AM NOT DONE
|
||||||
|
|
||||||
// This function returns how much icecream there is left in the fridge.
|
// 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 :(
|
// all, so there'll be no more left :(
|
||||||
fn maybe_icecream(time_of_day: u16) -> Option<u16> {
|
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
|
// 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.
|
// time_of_day > 23.
|
||||||
// TODO: Complete the function body - remember to return an Option!
|
// TODO: Complete the function body - remember to return an Option!
|
||||||
???
|
???
|
||||||
|
@ -22,10 +22,11 @@ mod tests {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn check_icecream() {
|
fn check_icecream() {
|
||||||
|
assert_eq!(maybe_icecream(0), Some(5));
|
||||||
assert_eq!(maybe_icecream(9), Some(5));
|
assert_eq!(maybe_icecream(9), Some(5));
|
||||||
assert_eq!(maybe_icecream(10), Some(5));
|
assert_eq!(maybe_icecream(18), Some(5));
|
||||||
assert_eq!(maybe_icecream(23), Some(0));
|
|
||||||
assert_eq!(maybe_icecream(22), Some(0));
|
assert_eq!(maybe_icecream(22), Some(0));
|
||||||
|
assert_eq!(maybe_icecream(23), Some(0));
|
||||||
assert_eq!(maybe_icecream(25), None);
|
assert_eq!(maybe_icecream(25), None);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -196,7 +196,7 @@ fn prompt_for_completion(
|
||||||
if no_emoji {
|
if no_emoji {
|
||||||
println!("\n~*~ {success_msg} ~*~\n");
|
println!("\n~*~ {success_msg} ~*~\n");
|
||||||
} else {
|
} else {
|
||||||
println!("\n🎉 🎉 {success_msg} 🎉 🎉\n");
|
println!("\n🎉 🎉 {success_msg} 🎉 🎉\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(output) = prompt_output {
|
if let Some(output) = prompt_output {
|
||||||
|
|
Loading…
Reference in a new issue