Skip to content

Commit

Permalink
Auto merge of #25402 - parir:master, r=Manishearth
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed May 15, 2015
2 parents 7ebaf1c + 94ecc37 commit 13a4b83
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/doc/trpl/dining-philosophers.md
Expand Up @@ -396,7 +396,7 @@ let handles: Vec<_> = philosophers.into_iter().map(|p| {
}).collect();
```

While this is only five lines, they’re a dense four. Let’s break it down.
While this is only five lines, they’re a dense five. Let’s break it down.

```rust,ignore
let handles: Vec<_> =
Expand Down
12 changes: 6 additions & 6 deletions src/doc/trpl/guessing-game.md
Expand Up @@ -27,7 +27,7 @@ Check out the generated `Cargo.toml`:
[package]

name = "guessing_game"
version = "0.0.1"
version = "0.1.0"
authors = ["Your Name <you@example.com>"]
```

Expand All @@ -46,7 +46,7 @@ Let’s try compiling what Cargo gave us:

```{bash}
$ cargo build
Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
```

Excellent! Open up your `src/main.rs` again. We’ll be writing all of
Expand All @@ -58,7 +58,7 @@ Try it out:

```bash
$ cargo run
Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
Running `target/debug/guessing_game`
Hello, world!
```
Expand Down Expand Up @@ -727,7 +727,7 @@ Let’s try our program out!
```bash
$ cargo run
Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
Running `target/guessing_game`
Guess the number!
The secret number is: 58
Expand Down Expand Up @@ -792,7 +792,7 @@ and quit. Observe:
```bash
$ cargo run
Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
Running `target/guessing_game`
Guess the number!
The secret number is: 59
Expand Down Expand Up @@ -929,7 +929,7 @@ Now we should be good! Let’s try:
```bash
$ cargo run
Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)
Running `target/guessing_game`
Guess the number!
The secret number is: 61
Expand Down

0 comments on commit 13a4b83

Please sign in to comment.