summaryrefslogtreecommitdiff
path: root/exercises/13_error_handling/errors2.rs
diff options
context:
space:
mode:
Diffstat (limited to 'exercises/13_error_handling/errors2.rs')
-rw-r--r--exercises/13_error_handling/errors2.rs19
1 files changed, 11 insertions, 8 deletions
diff --git a/exercises/13_error_handling/errors2.rs b/exercises/13_error_handling/errors2.rs
index 345a0ee..e50a929 100644
--- a/exercises/13_error_handling/errors2.rs
+++ b/exercises/13_error_handling/errors2.rs
@@ -2,16 +2,16 @@
// 5 tokens, and whenever you purchase items there is a processing fee of 1
// token. A player of the game will type in how many items they want to buy, and
// the `total_cost` function will calculate the total cost of the items. Since
-// the player typed in the quantity, though, we get it as a string-- and they
-// might have typed anything, not just numbers!
+// the player typed in the quantity, we get it as a string. They might have
+// typed anything, not just numbers!
//
// Right now, this function isn't handling the error case at all (and isn't
-// handling the success case properly either). What we want to do is: if we call
+// handling the success case properly either). What we want to do is: If we call
// the `total_cost` function on a string that is not a number, that function
-// will return a `ParseIntError`, and in that case, we want to immediately
-// return that error from our function and not try to multiply and add.
+// will return a `ParseIntError`. In that case, we want to immediately return
+// that error from our function and not try to multiply and add.
//
-// There are at least two ways to implement this that are both correct-- but one
+// There are at least two ways to implement this that are both correct. But one
// is a lot shorter!
use std::num::ParseIntError;
@@ -19,6 +19,8 @@ use std::num::ParseIntError;
fn total_cost(item_quantity: &str) -> Result<i32, ParseIntError> {
let processing_fee = 1;
let cost_per_item = 5;
+
+ // TODO: Handle the error case as described above.
let qty = item_quantity.parse::<i32>();
Ok(qty * cost_per_item + processing_fee)
@@ -31,6 +33,7 @@ fn main() {
#[cfg(test)]
mod tests {
use super::*;
+ use std::num::IntErrorKind;
#[test]
fn item_quantity_is_a_valid_number() {
@@ -40,8 +43,8 @@ mod tests {
#[test]
fn item_quantity_is_an_invalid_number() {
assert_eq!(
- total_cost("beep boop").unwrap_err().to_string(),
- "invalid digit found in string"
+ total_cost("beep boop").unwrap_err().kind(),
+ &IntErrorKind::InvalidDigit,
);
}
}