---

yaml
---
r: 127084
b: refs/heads/snap-stage3
c: 46d1ee7
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 7be8f0af0393dcdb077c2f6b1653836fd3fba235
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: fd69365ead71e6ee0ca2990a926a163df5076f2d
+refs/heads/snap-stage3: 46d1ee72ac0292adb3db66de23216b57a40a52b2
 refs/heads/try: 502e4c045236682e9728539dc0d2b3d0b237f55c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/mk/docs.mk

@@ -285,7 +285,7 @@ doc/$(1)/:
 $(2) += doc/$(1)/index.html
 doc/$(1)/index.html: CFG_COMPILER_HOST_TRIPLE = $(CFG_TARGET)
 doc/$(1)/index.html: $$(LIB_DOC_DEP_$(1)) doc/$(1)/
-	@$$(call E, rustdoc $$@)
+	@$$(call E, rustdoc: $$@)
 	$$(Q)$$(RUSTDOC) --cfg dox --cfg stage2 $$<
 endef
 

branches/snap-stage3/src/compiletest/common.rs

@@ -136,7 +136,7 @@ pub struct Config {
     // Extra parameter to run adb on arm-linux-androideabi
     pub adb_path: String,
 
-    // Extra parameter to run test sute on arm-linux-androideabi
+    // Extra parameter to run test suite on arm-linux-androideabi
     pub adb_test_dir: String,
 
     // status whether android device available or not

branches/snap-stage3/src/compiletest/runtest.rs

@@ -325,7 +325,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
     let DebuggerCommands { commands, check_lines, .. } = parse_debugger_commands(testfile, "gdb");
     let mut cmds = commands.connect("\n");
 
-    // compile test file (it shoud have 'compile-flags:-g' in the header)
+    // compile test file (it should have 'compile-flags:-g' in the header)
     let compiler_run_result = compile_test(config, props, testfile);
     if !compiler_run_result.status.success() {
         fatal_proc_rec("compilation failed!", &compiler_run_result);
@@ -520,7 +520,7 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
 
     let config = &mut config;
 
-    // compile test file (it shoud have 'compile-flags:-g' in the header)
+    // compile test file (it should have 'compile-flags:-g' in the header)
     let compile_result = compile_test(config, props, testfile);
     if !compile_result.status.success() {
         fatal_proc_rec("compilation failed!", &compile_result);

branches/snap-stage3/src/doc/complement-design-faq.md

@@ -1,4 +1,4 @@
-% Rust Design FAQ
+% The Rust Design FAQ
 
 This document describes decisions were arrived at after lengthy discussion and
 experimenting with alternatives. Please do not propose reversing them unless

branches/snap-stage3/src/doc/complement-lang-faq.md

@@ -1,4 +1,4 @@
-% Language FAQ
+% The Rust Language FAQ
 
 ## Are there any big programs written in it yet? I want to read big samples.
 
@@ -162,4 +162,15 @@ debugging linking in the compiler you might set
 `RUST_LOG=rustc::metadata::creader,rustc::util::filesearch,rustc::back::rpath`
 For a full description see [the logging crate][1].
 
+## How fast is Rust?
+
+As always, this question is difficult to answer. There's still a lot of work to
+do on speed, and depending on what you're benchmarking, Rust has variable
+performance.
+
+That said, it is an explicit goal of Rust to be as fast as C++ for most things.
+Language decisions are made with performance in mind, and we want Rust to be as
+fast as possible. Given that Rust is built on top of LLVM, any performance
+improvements in it also help us be faster.
+
 [1]:log/index.html

branches/snap-stage3/src/doc/complement-project-faq.md

@@ -1,4 +1,4 @@
-% Project FAQ
+% The Rust Project FAQ
 
 # What is this project's goal, in one sentence?
 

branches/snap-stage3/src/doc/guide-strings.md

@@ -1,4 +1,4 @@
-% The Strings Guide
+% The Guide to Rust Strings
 
 Strings are an important concept to master in any programming language. If you
 come from a managed language background, you may be surprised at the complexity

branches/snap-stage3/src/doc/guide-unsafe.md

@@ -1,4 +1,4 @@
-% Writing Safe Unsafe and Low-Level Code
+% Writing Unsafe and Low-Level Code in Rust
 
 # Introduction
 

branches/snap-stage3/src/doc/guide.md

@@ -152,7 +152,7 @@ Now that you've got your file open, type this in:
 
 ```
 fn main() {
-    println!("Hello, world");
+    println!("Hello, world!");
 }
 ```
 
@@ -161,7 +161,7 @@ Save the file, and then type this into your terminal window:
 ```{bash}
 $ rustc hello_world.rs
 $ ./hello_world # or hello_world.exe on Windows
-Hello, world
+Hello, world!
 ```
 
 Success! Let's go over what just happened in detail.
@@ -187,7 +187,7 @@ declaration, with one space in between.
 Next up is this line:
 
 ```
-    println!("Hello, world");
+    println!("Hello, world!");
 ```
 
 This line does all of the work in our little program. There are a number of
@@ -205,7 +205,7 @@ to mention: Rust's macros are significantly different than C macros, if you've
 used those. Don't be scared of using macros. We'll get to the details
 eventually, you'll just have to trust us for now.
 
-Next, `"Hello, world"` is a **string**. Strings are a surprisingly complicated
+Next, `"Hello, world!"` is a **string**. Strings are a surprisingly complicated
 topic in a systems programming language, and this is a **statically allocated**
 string. We will talk more about different kinds of allocation later. We pass
 this string as an argument to `println!`, which prints the string to the
@@ -316,7 +316,7 @@ Put this inside:
 
 name = "hello_world"
 version = "0.1.0"
-authors = [ "someone@example.com" ]
+authors = [ "Your name <you@example.com>" ]
 
 [[bin]]
 
@@ -354,6 +354,18 @@ file, we would need to call `rustc` twice, and pass it a bunch of options to
 tell it to build everything together. With Cargo, as our project grows, we can
 just `cargo build` and it'll work the right way.
 
+You'll also notice that Cargo has created a new file: `Cargo.lock`.
+
+```{ignore,notrust}
+[root]
+name = "hello_world"
+version = "0.0.1"
+```
+
+This file is used by Cargo to keep track of dependencies in your application.
+Right now, we don't have any, so it's a bit sparse. You won't ever need
+to touch this file yourself, just let Cargo handle it.
+
 That's it! We've successfully built `hello_world` with Cargo. Even though our
 program is simple, it's using much of the real tooling that you'll use for the
 rest of your Rust career.
@@ -449,9 +461,9 @@ let x;
 ...we'll get an error:
 
 ```{ignore}
-src/guessing_game.rs:2:9: 2:10 error: cannot determine a type for this local variable: unconstrained type
-src/guessing_game.rs:2     let x;
-                               ^
+src/hello_world.rs:2:9: 2:10 error: cannot determine a type for this local variable: unconstrained type
+src/hello_world.rs:2     let x;
+                             ^
 ```
 
 Giving it a type will compile, though:
@@ -460,7 +472,7 @@ Giving it a type will compile, though:
 let x: int;
 ```
 
-Let's try it out. Change your `src/guessing_game.rs` file to look like this:
+Let's try it out. Change your `src/hello_world.rs` file to look like this:
 
 ```{rust}
 fn main() {
@@ -474,10 +486,10 @@ You can use `cargo build` on the command line to build it. You'll get a warning,
 but it will still print "Hello, world!":
 
 ```{ignore,notrust}
-   Compiling guessing_game v0.1.0 (file:/home/you/projects/guessing_game)
-src/guessing_game.rs:2:9: 2:10 warning: unused variable: `x`, #[warn(unused_variable)] on by default
-src/guessing_game.rs:2     let x: int;
-                               ^
+   Compiling hello_world v0.1.0 (file:/home/you/projects/hello_world)
+src/hello_world.rs:2:9: 2:10 warning: unused variable: `x`, #[warn(unused_variable)] on by default
+src/hello_world.rs:2     let x: int;
+                             ^
 ```
 
 Rust warns us that we never use the variable binding, but since we never use it,
@@ -496,16 +508,16 @@ And try to build it. You'll get an error:
 
 ```{bash}
 $ cargo build
-   Compiling guessing_game v0.1.0 (file:/home/you/projects/guessing_game)
-src/guessing_game.rs:4:39: 4:40 error: use of possibly uninitialized variable: `x`
-src/guessing_game.rs:4     println!("The value of x is: {}", x);
-                                                             ^
+   Compiling hello_world v0.1.0 (file:/home/you/projects/hello_world)
+src/hello_world.rs:4:39: 4:40 error: use of possibly uninitialized variable: `x`
+src/hello_world.rs:4     println!("The value of x is: {}", x);
+                                                           ^
 note: in expansion of format_args!
 <std macros>:2:23: 2:77 note: expansion site
 <std macros>:1:1: 3:2 note: in expansion of println!
-src/guessing_game.rs:4:5: 4:42 note: expansion site
+src/hello_world.rs:4:5: 4:42 note: expansion site
 error: aborting due to previous error
-Could not execute process `rustc src/guessing_game.rs --crate-type bin --out-dir /home/you/projects/guessing_game/target -L /home/you/projects/guessing_game/target -L /home/you/projects/guessing_game/target/deps` (status=101)
+Could not execute process `rustc src/hello_world.rs --crate-type bin --out-dir /home/you/projects/hello_world/target -L /home/you/projects/hello_world/target -L /home/you/projects/hello_world/target/deps` (status=101)
 ```
 
 Rust will not let us use a value that has not been initialized. So why let us
@@ -1594,41 +1606,45 @@ taken to the screen. Sound good?
 
 ## Set up
 
-Let's set up a new project. Go to your projects directory, and make a new
-directory for the project, as well as a `src` directory for our code:
+Let's set up a new project. Go to your projects directory. Remember how we
+had to create our directory structure and a `Cargo.toml` for `hello_world`? Cargo
+has a command that does that for us. Let's give it a shot:
 
 ```{bash}
 $ cd ~/projects
-$ mkdir guessing_game
+$ cargo new guessing_game --bin
 $ cd guessing_game
-$ mkdir src
 ```
 
-Great. Next, let's make a `Cargo.toml` file so Cargo knows how to build our
-project:
+We pass the name of our project to `cargo new`, and then the `--bin` flag,
+since we're making a binary, rather than a library.
+
+Check out the generated `Cargo.toml`:
 
 ```{ignore}
 [package]
 
 name = "guessing_game"
 version = "0.1.0"
-authors = [ "someone@example.com" ]
+authors = ["Your Name <you@example.com>"]
 
 [[bin]]
 
 name = "guessing_game"
 ```
 
-Finally, we need our source file. Let's just make it hello world for now, so we
-can check that our setup works. In `src/guessing_game.rs`:
+Cargo gets this information from your environment. If it's not correct, go ahead
+and fix that.
+
+Finally, Cargo generated a hello, world for us. Check out `src/main.rs`:
 
 ```{rust}
 fn main() {
     println!("Hello world!");
 }
 ```
 
-Let's make sure that worked:
+Let's try compiling what Cargo gave us:
 
 ```{bash}
 $ cargo build
@@ -1883,7 +1899,6 @@ fn cmp(a: int, b: int) -> Ordering {
 If we try to compile, we'll get some errors:
 
 ```{notrust,ignore}
-$ cargo build
 $ cargo build
    Compiling guessing_game v0.1.0 (file:/home/you/projects/guessing_game)
 src/guessing_game.rs:20:15: 20:20 error: mismatched types: expected `int` but found `collections::string::String` (expected int but found struct collections::string::String)
@@ -2486,27 +2501,7 @@ Enough talk, let's build something! Let's make a new project called `modules`.
 
 ```{bash,ignore}
 $ cd ~/projects
-$ mkdir modules
-$ cd modules
-$ mkdir src
-```
-
-We need to make our two 'hello world' files. In `src/main.rs`:
-
-```{rust}
-fn main() {
-    println!("Hello, world!");
-}
-```
-
-And in `Cargo.toml`:
-
-```{notrust,ignore}
-[package]
-
-name = "modules"
-version = "0.1.0"
-authors = [ "[email protected]" ]
+$ cargo new modules --bin
 ```
 
 Let's double check our work by compiling:
@@ -2924,34 +2919,16 @@ now: make a new project:
 
 ```{bash,ignore}
 $ cd ~/projects
-$ mkdir testing
+$ cargo new testing --bin
 $ cd testing
-$ mkdir test
-```
-
-In `src/main.rs`:
-
-```{rust}
-fn main() {
-    println!("Hello, world!");
-}
-```
-
-And in `Cargo.toml`:
-
-```{notrust,ignore}
-[package]
-
-name = "testing"
-version = "0.1.0"
-authors = [ "[email protected]" ]
 ```
 
 And try it out:
 
 ```{notrust,ignore}
 $ cargo run
    Compiling testing v0.1.0 (file:/home/you/projects/testing)
+     Running `target/testing`
 Hello, world!
 $
 ```

branches/snap-stage3/src/doc/index.md

@@ -1,4 +1,4 @@
-% Rust documentation
+% Rust Documentation
 
 <!-- Completely hide the TOC and the section numbers -->
 <style type="text/css">
@@ -19,7 +19,7 @@ li {list-style-type: none; }
 * [Containers and Iterators](guide-container.html)
 * [Tasks and Communication](guide-tasks.html)
 * [Foreign Function Interface](guide-ffi.html)
-* [Writing Safe Unsafe and Low-Level Code](guide-unsafe.html)
+* [Writing Unsafe and Low-Level Code](guide-unsafe.html)
 * [Macros](guide-macros.html)
 * [Testing](guide-testing.html)
 * [Rust's Runtime](guide-runtime.html)

branches/snap-stage3/src/doc/rust.css

@@ -324,13 +324,14 @@ table th {
 
 .rusttest { display: none; }
 pre.rust { position: relative; }
-pre.rust a { transform: scaleX(-1); }
 .test-arrow {
     display: inline-block;
     position: absolute;
     top: 0;
     right: 10px;
     font-size: 150%;
+    -webkit-transform: scaleX(-1);
+    transform: scaleX(-1);
 }
 
 @media (min-width: 1170px) {

branches/snap-stage3/src/doc/rust.md

@@ -1823,11 +1823,11 @@ meta_item : ident [ '=' literal
 meta_seq : meta_item [ ',' meta_seq ] ? ;
 ~~~~
 
-Static entities in Rust — crates, modules and items — may have _attributes_
-applied to them. Attributes in Rust are modeled on Attributes in ECMA-335,
-with the syntax coming from ECMA-334 (C#). An attribute is a general,
-free-form metadatum that is interpreted according to name, convention, and
-language and compiler version. Attributes may appear as any of:
+Any item declaration may have an _attribute_ applied to it. Attributes in Rust
+are modeled on Attributes in ECMA-335, with the syntax coming from ECMA-334
+(C#). An attribute is a general, free-form metadatum that is interpreted
+according to name, convention, and language and compiler version. Attributes
+may appear as any of:
 
 * A single identifier, the attribute name
 * An identifier followed by the equals sign '=' and a literal, providing a