nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-13 16:22:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated usage of StrExt.parse() as per a recommendation by edwardw.

Browse Source
This commit is contained in:
Nick Sarten 2015-02-12 20:48:09 +13:00
parent 9e9b1d6085
commit 830009543d
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/doc/reference.md
View File

@ -3005,7 +3005,7 @@ Some examples of call expressions:
# fn add(x: i32, y: i32) -> i32 { 0 }
let x: i32 = add(1i32, 2i32);
let pi: Option<f32> = "3.14".parse();
let pi: Result<f32, _> = "3.14".parse();
```
### Lambda expressions

46
src/doc/trpl/guessing-game.md
View File

@ -400,7 +400,7 @@ a function for that:
let input = old_io::stdin().read_line()
.ok()
.expect("Failed to read line");
let input_num: Option<u32> = input.parse().ok();
let input_num: Result<u32, _> = input.parse();
```
The `parse` function takes in a `&str` value and converts it into something.
@ -422,8 +422,8 @@ In this case, we say `x` is a `u32` explicitly, so Rust is able to properly
tell `random()` what to generate. In a similar fashion, both of these work:
```{rust,ignore}
let input_num = "5".parse::<u32>().ok(); // input_num: Option<u32>
let input_num: Option<u32> = "5".parse().ok(); // input_num: Option<u32>
let input_num = "5".parse::<u32>(); // input_num: Option<u32>
let input_num: Result<u32, _> = "5".parse(); // input_num: Result<u32, <u32 as FromStr>::Err>
```
Here we're converting the `Result` returned by `parse` to an `Option` by using
@ -447,9 +447,9 @@ fn main() {
let input = old_io::stdin().read_line()
.ok()
.expect("Failed to read line");
let input_num: Option<u32> = input.parse().ok();
let input_num: Result<u32, _> = input.parse();
println!("You guessed: {}", input_num);
println!("You guessed: {:?}", input_num);
match cmp(input_num, secret_number) {
Ordering::Less => println!("Too small!"),
@ -497,11 +497,11 @@ fn main() {
let input = old_io::stdin().read_line()
.ok()
.expect("Failed to read line");
let input_num: Option<u32> = input.parse().ok();
let input_num: Result<u32, _> = input.parse();
let num = match input_num {
Some(num) => num,
None => {
Ok(num) => num,
Err(_) => {
println!("Please input a number!");
return;
}
@ -564,11 +564,11 @@ fn main() {
let input = old_io::stdin().read_line()
.ok()
.expect("Failed to read line");
let input_num: Option<u32> = input.trim().parse().ok();
let input_num: Result<u32, _> = input.trim().parse();
let num = match input_num {
Some(num) => num,
None => {
Ok(num) => num,
Err(_) => {
println!("Please input a number!");
return;
}
@ -640,11 +640,11 @@ fn main() {
let input = old_io::stdin().read_line()
.ok()
.expect("Failed to read line");
let input_num: Option<u32> = input.trim().parse().ok();
let input_num: Result<u32, _> = input.trim().parse();
let num = match input_num {
Some(num) => num,
None => {
Ok(num) => num,
Err(_) => {
println!("Please input a number!");
return;
}
@ -716,11 +716,11 @@ fn main() {
let input = old_io::stdin().read_line()
.ok()
.expect("Failed to read line");
let input_num: Option<u32> = input.trim().parse().ok();
let input_num: Result<u32, _> = input.trim().parse();
let num = match input_num {
Some(num) => num,
None => {
Ok(num) => num,
Err(_) => {
println!("Please input a number!");
return;
}
@ -772,11 +772,11 @@ fn main() {
let input = old_io::stdin().read_line()
.ok()
.expect("Failed to read line");
let input_num: Option<u32> = input.trim().parse().ok();
let input_num: Result<u32, _> = input.trim().parse();
let num = match input_num {
Some(num) => num,
None => {
Ok(num) => num,
Err(_) => {
println!("Please input a number!");
continue;
}
@ -849,11 +849,11 @@ fn main() {
let input = old_io::stdin().read_line()
.ok()
.expect("Failed to read line");
let input_num: Option<u32> = input.trim().parse().ok();
let input_num: Result<u32, _> = input.trim().parse();
let num = match input_num {
Some(num) => num,
None => {
Ok(num) => num,
Err(_) => {
println!("Please input a number!");
continue;
}