From 7b5af93d756464638204b0b703485712d88d3656 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 1 Jul 2015 23:11:31 +0200 Subject: [PATCH] add trim() to reading from stdin, so that it also works on Windows --- src/part03.rs | 3 ++- workspace/src/part03.rs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/part03.rs b/src/part03.rs index ecb8b15..d8d71b1 100644 --- a/src/part03.rs +++ b/src/part03.rs @@ -50,12 +50,13 @@ fn read_vec() -> Vec { // 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::` is `parse` with its generic type set to `i32`. - match line.parse::() { + match line.trim().parse::() { //@ `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 d1aea31..5a5327c 100644 --- a/workspace/src/part03.rs +++ b/workspace/src/part03.rs @@ -22,7 +22,7 @@ fn read_vec() -> Vec { let line = line.unwrap(); // Now that we have our `String`, we want to make it an `i32`. - match line.parse::() { + match line.trim().parse::() { Ok(num) => { unimplemented!() }, -- 2.30.2