Skip to content

Rollup of 3 pull requests #26238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 12, 2015
Merged

Rollup of 3 pull requests #26238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a47d7a7
Explain the `--bin` flag more clearly
nathanl Apr 16, 2015
e2e292c
Don't link to specific versions of rust in the book.
Stebalien Jun 11, 2015
3c6dcea
Add Terminal.com to the list of companies using rust in production.
reem Jun 11, 2015
18f70e3
Rollup merge of #24495 - nathanl:nathanl-explain-bin-flag, r=stevekla…
Manishearth Jun 12, 2015
8f841b2
Rollup merge of #26229 - Stebalien:versionless-book, r=steveklabnik
Manishearth Jun 12, 2015
a9ea380
Rollup merge of #26231 - reem:patch-2, r=Gankro
Manishearth Jun 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/doc/complement-lang-faq.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Yes. For example (incomplete):
* [wit.ai](https://github.com/wit-ai/witd)
* [Codius](https://codius.org/blog/codius-rust/)
* [MaidSafe](http://maidsafe.net/)
* [Terminal.com](https://terminal.com)

## Does it run on Windows?

Expand Down
3 changes: 1 addition & 2 deletions src/doc/trpl/hello-cargo.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,7 @@ To start a new project with Cargo, use `cargo new`:
$ cargo new hello_world --bin
```

We’re passing `--bin` because we're making a binary program: if we were making
a library, we'd leave it off.
We’re passing `--bin` because our goal is to get straight to making an executable application, as opposed to a library. Executables are often called ‘binaries.’ (as in `/usr/bin`, if you’re on a Unix system)

Let's check out what Cargo has generated for us:

Expand Down
12 changes: 5 additions & 7 deletions src/doc/trpl/installing-rust.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@ $ sh rustup.sh

[insecurity]: http://curlpipesh.tumblr.com

If you're on Windows, please download either the [32-bit installer][win32] or
the [64-bit installer][win64] and run it.
If you're on Windows, please download the appropriate [installer][install-page].

[win32]: https://static.rust-lang.org/dist/rust-1.0.0-i686-pc-windows-gnu.msi
[win64]: https://static.rust-lang.org/dist/rust-1.0.0-x86_64-pc-windows-gnu.msi
[install-page]: http://www.rust-lang.org/install.html

## Uninstalling

Expand All @@ -51,7 +49,6 @@ documentation on [building Rust from Source][from-source], or [the official
binary downloads][install-page].

[from-source]: https://github.com/rust-lang/rust#building-from-source
[install-page]: http://www.rust-lang.org/install.html

Oh, we should also mention the officially supported platforms:

Expand All @@ -75,10 +72,11 @@ If you've got Rust installed, you can open up a shell, and type this:
$ rustc --version
```

You should see the version number, commit hash, commit date and build date:
You should see the version number, commit hash, and commit date. If you just
installed version 1.0.0, you should see:

```bash
rustc 1.0.0 (a59de37e9 2015-05-13) (built 2015-05-14)
rustc 1.0.0 (a59de37e9 2015-05-13)
```

If you did, Rust has been installed successfully! Congrats!
Expand Down