Skip to content

Commit

Permalink
Rollup merge of rust-lang#36878 - BlueSpaceCanary:book-dedup-cargo-ru…
Browse files Browse the repository at this point in the history
…n-intro, r=GuillaumeGomez

Avoid introducing `run` twice in the Rust book

As it stands, getting-started.md and guessing-game.md both introduce `run` as a new command. I switched it so that the 2nd refers back to the first introduction, rather than re-introducing the command.

(First ever FOSS PR, sorry if I screwed up anything obvious :) )

r? @steveklabnik
  • Loading branch information
Manishearth committed Oct 4, 2016
2 parents 5a4ecb4 + bcac486 commit e39a78a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
3 changes: 3 additions & 0 deletions src/doc/book/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,9 @@ $ cargo run
Hello, world!
```

The `run` command comes in handy when you need to rapidly iterate on a
project.

Notice that this example didn’t re-build the project. Cargo figured out that
the file hasn’t changed, and so it just ran the binary. If you'd modified your
source code, Cargo would have rebuilt the project before running it, and you
Expand Down
9 changes: 3 additions & 6 deletions src/doc/book/guessing-game.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ $ cargo build
Excellent! Open up your `src/main.rs` again. We’ll be writing all of
our code in this file.

Before we move on, let me show you one more Cargo command: `run`. `cargo run`
is kind of like `cargo build`, but it also then runs the produced executable.
Try it out:
Remember the `run` command from last chapter? Try it out again here:

```bash
$ cargo run
Expand All @@ -67,9 +65,8 @@ $ cargo run
Hello, world!
```

Great! The `run` command comes in handy when you need to rapidly iterate on a
project. Our game is such a project, we need to quickly test each
iteration before moving on to the next one.
Great! Our game is just the kind of project `run` is good for: we need
to quickly test each iteration before moving on to the next one.

# Processing a Guess

Expand Down

0 comments on commit e39a78a

Please sign in to comment.