Skip to content

Commit 63629c8

Browse files
committed
---
yaml --- r: 229158 b: refs/heads/try c: d9b1882 h: refs/heads/master v: v3
1 parent 9a96d2a commit 63629c8

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: c2b564557d3c2c4ff8ba530a533da643c29694f6
4+
refs/heads/try: d9b18822489f5734eed9698beef3b0076d0ab9b3
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/doc/trpl/hello-cargo.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ so it is assumed that Rust projects will use Cargo from the beginning.
88
[cratesio]: http://doc.crates.io
99

1010
Cargo manages three things: building your code, downloading the dependencies
11-
your code needs, and building those dependencies. At first, your
12-
program doesn’t have any dependencies, so we’ll only be using the first part of
13-
its functionality. Eventually, we’ll add more. Since we started off by using
14-
Cargo, it'll be easy to add later.
11+
your code needs, and building those dependencies. At first, your program doesn’t
12+
have any dependencies, so we’ll only be using the first part of its
13+
functionality. Eventually, we’ll add more. Since we started off by using Cargo,
14+
it'll be easy to add later.
1515

16-
If you installed Rust via the official installers you will also have Cargo. If
17-
you installed Rust some other way, you may want to [check the Cargo
16+
If we installed Rust via the official installers we will also have Cargo. If we
17+
installed Rust some other way, we may want to [check the Cargo
1818
README][cargoreadme] for specific instructions about installing it.
1919

2020
[cargoreadme]: https://github.com/rust-lang/cargo#installing-cargo-from-nightlies
@@ -25,18 +25,18 @@ Let’s convert Hello World to Cargo.
2525

2626
To Cargo-ify our project, we need to do three things: Make a `Cargo.toml`
2727
configuration file, put our source file in the right place, and get rid of the
28-
old `main.exe`. Let's do that part first:
28+
old executable (`main.exe` on Windows, `main` everywhere else). Let's do that part first:
2929

3030
```bash
3131
$ mkdir src
3232
$ mv main.rs src/main.rs
33-
$ rm main.exe
33+
$ rm main # or main.exe on Windows
3434
```
3535

3636
Note that since we're creating an executable, we retain `main.rs` as the source
3737
filename. If we want to make a library instead, we should use `lib.rs`. This
3838
convention is required for Cargo to successfully compile our projects, but it
39-
can be overridden if we wish. Custom file locations for the entry point can be
39+
can be overridden if we wish. Custom file locations for the entry point can be
4040
specified with a [`[lib]` or `[[bin]]`][crates-custom] key in the TOML file.
4141

4242
[crates-custom]: http://doc.crates.io/manifest.html#configuring-a-target

0 commit comments

Comments
 (0)