add trim() to reading from stdin, so that it also works on Windows

diff --git a/src/part03.rs b/src/part03.rs
index ecb8b1583807c15ff20017509805c1f2bab3880e..d8d71b12cc138b95a477717f3a19d002b3513a5e 100644 (file)
--- a/src/part03.rs
+++ b/src/part03.rs
@@ -50,12 +50,13 @@ fn read_vec() -> Vec<i32> {
         // access the "old" `line` again.
         let line = line.unwrap();
         // Now that we have our `String`, we want to make it an `i32`.
         // access the "old" `line` again.
         let line = line.unwrap();
         // Now that we have our `String`, we want to make it an `i32`.

+        //@ We first `trim()` the `line` to remove leading and trailing whitespace.

         //@ `parse` is a method on `String` that can convert a string to anything. Try finding it's documentation!
 
         //@ In this case, Rust *could* figure out automatically that we need an `i32` (because of the return type
         //@ of the function), but that's a bit too much magic for my taste. We are being more explicit here:
         //@ `parse::<i32>` is `parse` with its generic type set to `i32`.
         //@ `parse` is a method on `String` that can convert a string to anything. Try finding it's documentation!
 
         //@ In this case, Rust *could* figure out automatically that we need an `i32` (because of the return type
         //@ of the function), but that's a bit too much magic for my taste. We are being more explicit here:
         //@ `parse::<i32>` is `parse` with its generic type set to `i32`.

-        match line.parse::<i32>() {
+        match line.trim().parse::<i32>() {

             //@ `parse` returns again a `Result`, and this time we use a `match` to handle errors (like, the user entering
             //@ something that is not a number).
             //@ This is a common pattern in Rust: Operations that could go wrong will return `Option` or `Result`.
             //@ `parse` returns again a `Result`, and this time we use a `match` to handle errors (like, the user entering
             //@ something that is not a number).
             //@ This is a common pattern in Rust: Operations that could go wrong will return `Option` or `Result`.

diff --git a/workspace/src/part03.rs b/workspace/src/part03.rs
index d1aea31702010478b81427deded02ab5f419f82d..5a5327c26962be4ea044de8d74afab0cc4377bff 100644 (file)
--- a/workspace/src/part03.rs
+++ b/workspace/src/part03.rs
@@ -22,7 +22,7 @@ fn read_vec() -> Vec<i32> {
         let line = line.unwrap();
         // Now that we have our `String`, we want to make it an `i32`.
 
         let line = line.unwrap();
         // Now that we have our `String`, we want to make it an `i32`.
 

-        match line.parse::<i32>() {
+        match line.trim().parse::<i32>() {

             Ok(num) => {
                 unimplemented!()
             },
             Ok(num) => {
                 unimplemented!()
             },