From a47d7a752e8554dc3cc3667b1715d95a3848f620 Mon Sep 17 00:00:00 2001 From: Nathan Long Date: Thu, 16 Apr 2015 06:16:52 -0400 Subject: [PATCH 1/3] Explain the `--bin` flag more clearly --- src/doc/trpl/hello-cargo.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/doc/trpl/hello-cargo.md b/src/doc/trpl/hello-cargo.md index 8d8b17343343..9406381a40fa 100644 --- a/src/doc/trpl/hello-cargo.md +++ b/src/doc/trpl/hello-cargo.md @@ -138,8 +138,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: From e2e292cc003484128b1edba42a46aa7f1a2f1291 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 11 Jun 2015 17:30:04 -0400 Subject: [PATCH 2/3] Don't link to specific versions of rust in the book. They're forever doomed to be out-of-date. Also, don't assume the user is installing a particular version. --- src/doc/trpl/installing-rust.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/doc/trpl/installing-rust.md b/src/doc/trpl/installing-rust.md index 73bbe77fe268..44eafd519294 100644 --- a/src/doc/trpl/installing-rust.md +++ b/src/doc/trpl/installing-rust.md @@ -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! From 3c6dcea985ad75934901f3cb988af93687dce26d Mon Sep 17 00:00:00 2001 From: Jonathan Reem Date: Thu, 11 Jun 2015 16:07:34 -0700 Subject: [PATCH 3/3] Add Terminal.com to the list of companies using rust in production. --- src/doc/complement-lang-faq.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/doc/complement-lang-faq.md b/src/doc/complement-lang-faq.md index 7a3d19408586..8b9467589c65 100644 --- a/src/doc/complement-lang-faq.md +++ b/src/doc/complement-lang-faq.md @@ -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?