OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #26238 - Manishearth:rollup, r=Manishearth 

- Successful merges: #24495, #26229, #26231
- Failed merges:
This commit is contained in:
bors 2015-06-12 06:25:49 +00:00
parent 69db64f304 a9ea380523
commit a2f2a64763
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/doc/complement-lang-faq.md
View File

@ -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?

3
src/doc/trpl/hello-cargo.md
View File

@ -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:

12
src/doc/trpl/installing-rust.md
View File

@ -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
@ -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:
@ -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!