mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #16722 : tshepang/rust/trailing-spaces, r=pcwalton

Browse Source
This commit is contained in:
bors 2014-08-24 13:51:03 +00:00
commit 084325f2d9
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/doc/guide.md
View File

@ -2021,7 +2021,7 @@ And trying it out:
```{notrust,ignore}
$ cargo build
Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
$ ./target/guessing_game
$ ./target/guessing_game
Guess the number!
The secret number is: 57
Please input your guess.
@ -2292,7 +2292,7 @@ print an error message and return. Let's give this a shot:
```{notrust,ignore}
$ cargo build
Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
$ ./target/guessing_game
$ ./target/guessing_game
Guess the number!
The secret number is: 17
Please input your guess.
@ -2358,11 +2358,11 @@ Let's try it!
```{notrust,ignore}
$ cargo build
Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
$ ./target/guessing_game
$ ./target/guessing_game
Guess the number!
The secret number is: 58
Please input your guess.
76
76
You guessed: 76
Too big!
$
@ -2436,7 +2436,7 @@ that `return`? If we give a non-number answer, we'll `return` and quit. Observe:
```{notrust,ignore}
$ cargo build
Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
$ ./target/guessing_game
$ ./target/guessing_game
Guess the number!
The secret number is: 59
Please input your guess.
@ -2569,7 +2569,7 @@ Now we should be good! Let's try:
```{rust,ignore}
$ cargo build
Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
$ ./target/guessing_game
$ ./target/guessing_game
Guess the number!
The secret number is: 61
Please input your guess.
@ -3718,18 +3718,18 @@ That's a lot to take in. It's also one of the _most_ important concepts in
all of Rust. Let's see this syntax in action:
```{rust}
{
{
let x = 5i; // x is the owner of this integer, which is memory on the stack.
// other code here...
} // privilege 1: when x goes out of scope, this memory is deallocated
/// this function borrows an integer. It's given back automatically when the
/// function returns.
fn foo(x: &int) -> &int { x }
fn foo(x: &int) -> &int { x }
{
{
let x = 5i; // x is the owner of this integer, which is memory on the stack.
// privilege 2: you may lend that resource, to as many borrowers as you'd like
@ -3739,14 +3739,14 @@ fn foo(x: &int) -> &int { x }
foo(&x); // functions can borrow too!
let a = &x; // we can do this alllllll day!
}
}
{
{
let mut x = 5i; // x is the owner of this integer, which is memory on the stack.
let y = &mut x; // privilege 3: you may lend that resource to a single borrower,
// mutably
}
}
```
If you are a borrower, you get a few privileges as well, but must also obey a
@ -4535,7 +4535,7 @@ let one_to_one_hundred = range(0i, 100i).collect();
```
As you can see, we call `collect()` on our iterator. `collect()` takes
as many values as the iterator will give it, and returns a collection
as many values as the iterator will give it, and returns a collection
of the results. So why won't this compile? Rust can't determine what
type of things you want to collect, and so you need to let it know.
Here's the version that does compile:
@ -5508,7 +5508,7 @@ fn main() {
}
```
Whew! This isn't too terrible. You can see that we still `let x = 5i`,
Whew! This isn't too terrible. You can see that we still `let x = 5i`,
but then things get a little bit hairy. Three more bindings get set: a
static format string, an argument vector, and the aruments. We then
invoke the `println_args` function with the generated arguments.