---

yaml
---
r: 127090
b: refs/heads/snap-stage3
c: 867d8e6
h: refs/heads/master
v: v3

Author: cakebaker

[refs]

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

branches/snap-stage3/.gitignore

@@ -1,88 +1,90 @@
-*.a
-*.aux
-*.bc
+*~
+\#*\#
+\#*
+.#*
+*.x86
+*.llvm
+*.out
 *.boot
-*.bz2
-*.cmi
-*.cmo
+*.rustc
 *.cmx
-*.cp
-*.cps
-*.d
-*.dSYM
-*.def
-*.diff
 *.dll
-*.dylib
-*.elc
-*.epub
+*.def
 *.exe
+*.a
+*.rlib
+*.so
+*.dylib
+*.orig
+*.cmo
+*.cmi
+*.dSYM
+*.d
+*.o
+*.ll
+*.bc
+*.aux
+*.cp
 *.fn
-*.html
 *.ky
-*.ll
-*.llvm
+*.cps
 *.log
-*.o
-*.orig
-*.out
-*.patch
 *.pdf
+*.epub
+*.html
 *.pg
-*.pot
-*.pyc
-*.rej
-*.rlib
-*.rustc
-*.so
-*.swo
-*.swp
-*.tmp
 *.toc
 *.tp
 *.vr
-*.x86
-*~
-.#*
-.DS_Store
-.cproject
+*.patch
+*.diff
+*.rej
+*.swp
+*.swo
+*.tmp
+*.pyc
+*.elc
 .hg/
 .hgignore
+.cproject
 .project
-.settings/
 .valgrindrc
-/*-*-*-*/
-/*-*-*/
+lexer.ml
+TAGS
+TAGS.emacs
+TAGS.vi
+version.ml
+version.texi
 /Makefile
-/build
-/dist/
-/dl/
-/doc
-/inst/
-/llvm/
-/mingw-build/
-/nd/
+config.mk
 /rt/
 /rustllvm/
+/test/
+/inst/
+/mingw-build/
+src/.DS_Store
+/tmp/
+/dist/
 /stage0/
+/dl/
 /stage1/
 /stage2/
 /stage3/
-/test/
-/tmp/
-TAGS
-TAGS.emacs
-TAGS.vi
-\#*
-\#*\#
-config.mk
-config.stamp
+*.bz2
+/doc
+/nd/
+/llvm/
+version.md
 keywords.md
-lexer.ml
-src/.DS_Store
+x86_64-apple-darwin/
+x86_64-unknown-linux-gnu/
+i686-unknown-linux-gnu/
+tmp.*.rs
+config.stamp
+.DS_Store
 src/etc/dl
+.settings/
+/build
+i686-pc-mingw32/
 src/librustc_llvm/llvmdeps.rs
-tmp.*.rs
-version.md
-version.ml
-version.texi
+*.pot

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 suite on arm-linux-androideabi
+    // Extra parameter to run test sute 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 should have 'compile-flags:-g' in the header)
+    // compile test file (it shoud 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 should have 'compile-flags:-g' in the header)
+    // compile test file (it shoud 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 @@
-% The Rust Design FAQ
+% 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 @@
-% The Rust Language FAQ
+% Language FAQ
 
 ## Are there any big programs written in it yet? I want to read big samples.
 

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

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

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

@@ -1,4 +1,4 @@
-% The Guide to Rust Strings
+% The Strings Guide
 
 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 Unsafe and Low-Level Code in Rust
+% Writing Safe Unsafe and Low-Level Code
 
 # Introduction
 

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

@@ -316,7 +316,7 @@ Put this inside:
 
 name = "hello_world"
 version = "0.1.0"
-authors = [ "Your name <you@example.com>" ]
+authors = [ "someone@example.com" ]
 
 [[bin]]
 
@@ -354,18 +354,6 @@ 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.
@@ -1060,7 +1048,6 @@ you create a new type that's a synonym for another one:
 
 ```
 struct Inches(int);
-struct Centimeters(int);
 
 let length = Inches(10);
 
@@ -1606,45 +1593,41 @@ taken to the screen. Sound good?
 
 ## Set up
 
-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:
+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:
 
 ```{bash}
 $ cd ~/projects
-$ cargo new guessing_game --bin
+$ mkdir guessing_game
 $ cd guessing_game
+$ mkdir src
 ```
 
-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`:
+Great. Next, let's make a `Cargo.toml` file so Cargo knows how to build our
+project:
 
 ```{ignore}
 [package]
 
 name = "guessing_game"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
+authors = [ "someone@example.com" ]
 
 [[bin]]
 
 name = "guessing_game"
 ```
 
-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`:
+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`:
 
 ```{rust}
 fn main() {
     println!("Hello world!");
 }
 ```
 
-Let's try compiling what Cargo gave us:
+Let's make sure that worked:
 
 ```{bash}
 $ cargo build
@@ -1899,6 +1882,7 @@ 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)
@@ -2501,7 +2485,27 @@ Enough talk, let's build something! Let's make a new project called `modules`.
 
 ```{bash,ignore}
 $ cd ~/projects
-$ cargo new modules --bin
+$ 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]" ]
 ```
 
 Let's double check our work by compiling:
@@ -2919,16 +2923,34 @@ now: make a new project:
 
 ```{bash,ignore}
 $ cd ~/projects
-$ cargo new testing --bin
+$ mkdir testing
 $ 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!
 $
 ```