Skip to content

Commit d925f85

Browse files
committed
---
yaml --- r: 215027 b: refs/heads/beta c: 629be84 h: refs/heads/master i: 215025: 8ee2a3c 215023: 6d9142f v: v3
1 parent f8083c9 commit d925f85

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: f9bfebb79087e6aa37037561aa7b1748d24f53c9
26+
refs/heads/beta: 629be845fdf58d34f5dc3bd1674ea57ebf3c9380
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 8c0aa6d64ebab528f7eb182812007155d6044972
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,17 @@ version = "0.0.1"
6363
authors = [ "Your name <[email protected]>" ]
6464
```
6565

66-
This file is in the [TOML][toml] format. Let’s let it explain itself to you:
66+
This file is in the [TOML][toml] format. TOML is similar to INI, but has some
67+
extra goodies. According to the Rust docs,
6768

6869
> TOML aims to be a minimal configuration file format that's easy to read due
6970
> to obvious semantics. TOML is designed to map unambiguously to a hash table.
7071
> TOML should be easy to parse into data structures in a wide variety of
7172
> languages.
7273
73-
TOML is very similar to INI, but with some extra goodies.
74-
7574
[toml]: https://github.com/toml-lang/toml
7675

77-
Once you have this file in place, we should be ready to build! Try this:
76+
Once you have this file in place, we should be ready to build! To do so, run:
7877

7978
```bash
8079
$ cargo build
@@ -83,7 +82,7 @@ $ ./target/debug/hello_world
8382
Hello, world!
8483
```
8584

86-
Bam! We build our project with `cargo build`, and run it with
85+
Bam! We built our project with `cargo build`, and ran it with
8786
`./target/debug/hello_world`. We can do both in one step with `cargo run`:
8887

8988
```bash
@@ -104,9 +103,9 @@ Hello, world!
104103
```
105104

106105
This hasn’t bought us a whole lot over our simple use of `rustc`, but think
107-
about the future: when our project gets more complex, we would need to do more
106+
about the future: when our project gets more complex, we need to do more
108107
things to get all of the parts to properly compile. With Cargo, as our project
109-
grows, we can just `cargo build`, and it’ll work the right way.
108+
grows, we can just run `cargo build`, and it’ll work the right way.
110109

111110
When your project is finally ready for release, you can use
112111
`cargo build --release` to compile your project with optimizations.
@@ -119,7 +118,7 @@ name = "hello_world"
119118
version = "0.0.1"
120119
```
121120

122-
This file is used by Cargo to keep track of dependencies in your application.
121+
The `Cargo.lock` is used by Cargo to keep track of dependencies in your application.
123122
Right now, we don’t have any, so it’s a bit sparse. You won't ever need
124123
to touch this file yourself, just let Cargo handle it.
125124

0 commit comments

Comments
 (0)