---

yaml
---
r: 127087
b: refs/heads/snap-stage3
c: 055e25a
h: refs/heads/master
i:
  127085: c01a733
  127083: b1509d8
  127079: 2cf084c
  127071: 4017d3c
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 7be8f0af0393dcdb077c2f6b1653836fd3fba235
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 821262f30e537d21440976d3f36b935c5e45d008
+refs/heads/snap-stage3: 055e25acbe9fd48e0791c6a97db27a19b4f36b45
 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.
 

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

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

branches/snap-stage3/src/libcollections/bitv.rs

@@ -1532,7 +1532,7 @@ pub struct BitPositions<'a> {
     next_idx: uint
 }
 
-/// An iterator combining wo `BitvSet` iterators.
+/// An iterator combining two `BitvSet` iterators.
 pub struct TwoBitPositions<'a> {
     set: &'a BitvSet,
     other: &'a BitvSet,

branches/snap-stage3/src/libcollections/priority_queue.rs

@@ -119,7 +119,7 @@
 //!     //           10      |               |
 //!     //                   +---------------+
 //!     //
-//!     // The graph is represented as an adjecency list where each index,
+//!     // The graph is represented as an adjacency list where each index,
 //!     // corresponding to a node value, has a list of outgoing edges.
 //!     // Chosen for it's efficiency.
 //!     let graph = vec![

branches/snap-stage3/src/libcollections/string.rs

@@ -842,7 +842,7 @@ pub mod raw {
     /// Create a `String` from a null-terminated *u8 buffer
     ///
     /// This function is unsafe because we dereference memory until we find the NUL character,
-    /// which is not guaranteed to be present. Additionaly, the slice is not checked to see
+    /// which is not guaranteed to be present. Additionally, the slice is not checked to see
     /// whether it contains valid UTF-8
     pub unsafe fn from_buf(buf: *const u8) -> String {
         let mut len = 0;

branches/snap-stage3/src/libcore/cell.rs

@@ -449,7 +449,7 @@ pub struct UnsafeCell<T> {
 }
 
 impl<T> UnsafeCell<T> {
-    /// Construct a new instance of `UnsafeCell` which will wrapp the specified
+    /// Construct a new instance of `UnsafeCell` which will wrap the specified
     /// value.
     ///
     /// All access to the inner value through methods is `unsafe`, and it is

branches/snap-stage3/src/libgreen/task.rs

@@ -118,7 +118,7 @@ extern fn bootstrap_green_task(task: uint, code: *mut (), env: *mut ()) -> ! {
     // preserving a handle to the GreenTask down to this point, this
     // unfortunately must call `GreenTask::convert`. In order to avoid
     // this we could add a `terminate` function to the `Runtime` trait
-    // in libstd, but that seems less appropriate since the coversion
+    // in libstd, but that seems less appropriate since the conversion
     // method exists.
     GreenTask::convert(task).terminate();
 }

branches/snap-stage3/src/libnative/io/net.rs

@@ -769,7 +769,7 @@ impl rtio::RtioUdpSocket for UdpSocket {
 // It turns out that there's this nifty MSG_DONTWAIT flag which can be passed to
 // send/recv, but the niftiness wears off once you realize it only works well on
 // linux [1] [2]. This means that it's pretty easy to get a nonblocking
-// operation on linux (no flag fidding, no affecting other objects), but not on
+// operation on linux (no flag fiddling, no affecting other objects), but not on
 // other platforms.
 //
 // To work around this constraint on other platforms, we end up using the

branches/snap-stage3/src/libnative/io/pipe_win32.rs

@@ -311,7 +311,7 @@ impl UnixStream {
                     }
                 }
 
-                // An example I found on microsoft's website used 20
+                // An example I found on Microsoft's website used 20
                 // seconds, libuv uses 30 seconds, hence we make the
                 // obvious choice of waiting for 25 seconds.
                 None => {

branches/snap-stage3/src/librustc/metadata/loader.rs

@@ -11,7 +11,7 @@
 //! Finds crate binaries and loads their metadata
 //!
 //! Might I be the first to welcome you to a world of platform differences,
-//! version requirements, dependency graphs, conficting desires, and fun! This
+//! version requirements, dependency graphs, conflicting desires, and fun! This
 //! is the major guts (along with metadata::creader) of the compiler for loading
 //! crates and resolving dependencies. Let's take a tour!
 //!
@@ -83,7 +83,7 @@
 //! 5. Does the target in the metadata agree with the current target?
 //! 6. Does the SVH match? (more on this later)
 //!
-//! If the file answeres `yes` to all these questions, then the file is
+//! If the file answers `yes` to all these questions, then the file is
 //! considered as being *candidate* for being accepted. It is illegal to have
 //! more than two candidates as the compiler has no method by which to resolve
 //! this conflict. Additionally, rlib/dylib candidates are considered
@@ -173,7 +173,7 @@
 //! ## Loading transitive dependencies
 //!
 //! Dealing with same-named-but-distinct crates is not just a local problem, but
-//! one that also needs to be dealt with for transitive dependences. Note that
+//! one that also needs to be dealt with for transitive dependencies. Note that
 //! in the letter above `--extern` flags only apply to the *local* set of
 //! dependencies, not the upstream transitive dependencies. Consider this
 //! dependency graph:
@@ -660,7 +660,7 @@ impl<'a> Context<'a> {
             false
         });
 
-        // Now that we have an itertor of good candidates, make sure there's at
+        // Now that we have an iterator of good candidates, make sure there's at
         // most one rlib and at most one dylib.
         let mut rlibs = HashSet::new();
         let mut dylibs = HashSet::new();

branches/snap-stage3/src/librustc/middle/ty.rs

@@ -269,7 +269,7 @@ pub struct ctxt {
 
     /// Stores the type parameters which were substituted to obtain the type
     /// of this node.  This only applies to nodes that refer to entities
-    /// param<eterized by type parameters, such as generic fns, types, or
+    /// parameterized by type parameters, such as generic fns, types, or
     /// other items.
     pub item_substs: RefCell<NodeMap<ItemSubsts>>,