summaryrefslogtreecommitdiff
path: root/exercises/options/options1.rs
diff options
context:
space:
mode:
Diffstat (limited to 'exercises/options/options1.rs')
-rw-r--r--exercises/options/options1.rs16
1 files changed, 7 insertions, 9 deletions
diff --git a/exercises/options/options1.rs b/exercises/options/options1.rs
index 038fb48..022d3d6 100644
--- a/exercises/options/options1.rs
+++ b/exercises/options/options1.rs
@@ -3,17 +3,13 @@
// I AM NOT DONE
-// you can modify anything EXCEPT for this function's signature
-fn print_number(maybe_number: Option<u16>) {
- println!("printing: {}", maybe_number.unwrap());
-}
-
// 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
// all, so there'll be no more left :(
// TODO: Return an Option!
fn maybe_icecream(time_of_day: u16) -> Option<u16> {
// We use the 24-hour system here, so 10PM is a value of 22
+ // The Option output should gracefully handle cases where time_of_day > 24.
???
}
@@ -23,15 +19,17 @@ mod tests {
#[test]
fn check_icecream() {
- assert_eq!(maybe_icecream(10), Some(5));
- assert_eq!(maybe_icecream(23), None);
- assert_eq!(maybe_icecream(22), None);
+ assert_eq!(maybe_icecream(9), Some(5));
+ assert_eq!(maybe_icecream(10), Some(0));
+ assert_eq!(maybe_icecream(23), Some(0));
+ assert_eq!(maybe_icecream(22), Some(0));
+ assert_eq!(maybe_icecream(25), None);
}
#[test]
fn raw_value() {
// TODO: Fix this test. How do you get at the value contained in the Option?
let icecreams = maybe_icecream(12);
- assert_eq!(icecreams, 5);
+ assert_eq!(icecreams, 0);
}
}