---

yaml
---
r: 128827
b: refs/heads/try
c: bede9ec
h: refs/heads/master
i:
  128825: 09cf34a
  128823: 55a533c
v: v3

Author: MatejLach

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 07d86b46a949a94223da714e35b343243e4ecce4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a86d9ad15e339ab343a12513f9c90556f677b9ca
-refs/heads/try: f8e0ede92157995665c7caf4ae115354139be46d
+refs/heads/try: bede9ecdfe64ae59e054df455ff22b6563ac0512
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/compiletest/header.rs

@@ -233,7 +233,7 @@ fn parse_exec_env(line: &str) -> Option<(String, String)> {
     parse_name_value_directive(line, "exec-env").map(|nv| {
         // nv is either FOO or FOO=BAR
         let mut strs: Vec<String> = nv.as_slice()
-                                      .splitn(1, '=')
+                                      .splitn('=', 1)
                                       .map(|s| s.to_string())
                                       .collect();
 

branches/try/src/compiletest/runtest.rs

@@ -30,7 +30,6 @@ use std::os;
 use std::str;
 use std::string::String;
 use std::task;
-use std::time::Duration;
 use test::MetricMap;
 
 pub fn run(config: Config, testfile: String) {
@@ -401,7 +400,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
                 .expect(format!("failed to exec `{}`", config.adb_path).as_slice());
             loop {
                 //waiting 1 second for gdbserver start
-                timer::sleep(Duration::milliseconds(1000));
+                timer::sleep(1000);
                 let result = task::try(proc() {
                     tcp::TcpStream::connect("127.0.0.1", 5039).unwrap();
                 });

branches/try/src/doc/guide-ffi.md

@@ -350,9 +350,9 @@ linking to, and in the second case `bar` is the type of native library that the
 compiler is linking to. There are currently three known types of native
 libraries:
 
-* Dynamic - `#[link(name = "readline")]`
-* Static - `#[link(name = "my_build_dependency", kind = "static")]`
-* Frameworks - `#[link(name = "CoreFoundation", kind = "framework")]`
+* Dynamic - `#[link(name = "readline")]
+* Static - `#[link(name = "my_build_dependency", kind = "static")]
+* Frameworks - `#[link(name = "CoreFoundation", kind = "framework")]
 
 Note that frameworks are only available on OSX targets.
 

branches/try/src/doc/guide-runtime.md

@@ -128,7 +128,7 @@ itself, yet again implying that they are not defined in the standard library.
 The full complement of runtime features is defined by the [`Runtime`
 trait](std/rt/trait.Runtime.html) and the [`Task`
 struct](std/rt/task/struct.Task.html). A `Task` is constant among all runtime
-implementations, but each runtime has its own implementation of the
+implementations, but each runtime implements has its own implementation of the
 `Runtime` trait.
 
 The local `Task` stores the runtime value inside of itself, and then ownership

branches/try/src/doc/guide-testing.md

@@ -198,7 +198,7 @@ per-iteration speed of.
 
 For benchmarks relating to processing/generating data, one can set the
 `bytes` field to the number of bytes consumed/produced in each
-iteration; this will be used to show the throughput of the benchmark.
+iteration; this will used to show the throughput of the benchmark.
 This must be the amount used in each iteration, *not* the total
 amount.
 

branches/try/src/doc/guide-unsafe.md

@@ -137,7 +137,7 @@ explicitly with, respectively, `value as *const T` and `value as *mut T`).
 
 Going the opposite direction, from `*const` to a reference `&`, is not
 safe. A `&T` is always valid, and so, at a minimum, the raw pointer
-`*const T` has to point to a valid instance of type `T`. Furthermore,
+`*const T` has to be a valid to a valid instance of type `T`. Furthermore,
 the resulting pointer must satisfy the aliasing and mutability laws of
 references. The compiler assumes these properties are true for any
 references, no matter how they are created, and so any conversion from

branches/try/src/doc/guide.md

@@ -666,7 +666,7 @@ This is not the same as this, which won't compile:
 ```{ignore}
 let x = 5i;
 
-let y: int = if x == 5i { 10i; } else { 15i; };
+let y: int = if x == 5 { 10i; } else { 15i; };
 ```
 
 Note the semicolons after the 10 and 15. Rust will give us the following error:
@@ -1360,7 +1360,7 @@ while !done {
 ```
 
 `while` loops are the correct choice when you're not sure how many times
-you need to loop. 
+you need to loop.
 
 If you need an infinite loop, you may be tempted to write this:
 
@@ -1650,7 +1650,7 @@ a full line of input. Nice and easy.
 .ok().expect("Failed to read line");
 ```
 
-Do you remember this code? 
+Do you remember this code?
 
 ```
 enum OptionalInt {
@@ -1796,6 +1796,21 @@ Excellent! Open up your `src/main.rs` again. We'll be writing all of
 our code in this file. We'll talk about multiple-file projects later on in the
 guide.
 
+Before we move on, let me show you one more Cargo command: `run`. `cargo run`
+is kind of like `cargo build`, but it also then runs the produced exectuable.
+Try it out:
+
+```{notrust,ignore}
+$ cargo run
+   Compiling guessing_game v0.1.0 (file:/home/you/projects/guessing_game)
+     Running `target/guessing_game`
+Hello, world!
+$
+```
+
+Great! The `run` command comes in handy when you need to rapidly iterate on a project.
+Our game is just such a project, we need to quickly test each iteration before moving on to the next one.
+
 ## Processing a Guess
 
 Let's get to it! The first thing we need to do for our guessing game is
@@ -1933,19 +1948,19 @@ $
 Excellent! Try running our new program a few times:
 
 ```{notrust,ignore}
-$ ./target/guessing_game 
+$ ./target/guessing_game
 Guess the number!
 The secret number is: 7
 Please input your guess.
 4
 You guessed: 4
-$ ./target/guessing_game 
+$ ./target/guessing_game
 Guess the number!
 The secret number is: 83
 Please input your guess.
 5
 You guessed: 5
-$ ./target/guessing_game 
+$ ./target/guessing_game
 Guess the number!
 The secret number is: -29
 Please input your guess.
@@ -1986,7 +2001,7 @@ And trying it out:
 ```{notrust,ignore}
 $ cargo build
    Compiling guessing_game v0.1.0 (file:/home/you/projects/guessing_game)
-$ ./target/guessing_game 
+$ ./target/guessing_game
 Guess the number!
 The secret number is: 57
 Please input your guess.
@@ -2022,7 +2037,7 @@ fn main() {
 
     println!("You guessed: {}", input);
 
-    match cmp(input, secret_number) { 
+    match cmp(input, secret_number) {
         Less    => println!("Too small!"),
         Greater => println!("Too big!"),
         Equal   => { println!("You win!"); },
@@ -2106,7 +2121,7 @@ a `String` instead! That's because our `input` variable is coming from the
 standard input, and you can guess anything. Try it:
 
 ```{notrust,ignore}
-$ ./target/guessing_game 
+$ ./target/guessing_game
 Guess the number!
 The secret number is: 73
 Please input your guess.
@@ -2257,7 +2272,7 @@ print an error message and return. Let's give this a shot:
 ```{notrust,ignore}
 $ cargo build
    Compiling guessing_game v0.1.0 (file:/home/you/projects/guessing_game)
-$ ./target/guessing_game 
+$ ./target/guessing_game
 Guess the number!
 The secret number is: 17
 Please input your guess.
@@ -2323,7 +2338,7 @@ Let's try it!
 ```{notrust,ignore}
 $ cargo build
    Compiling guessing_game v0.1.0 (file:/home/you/projects/guessing_game)
-$ ./target/guessing_game 
+$ ./target/guessing_game
 Guess the number!
 The secret number is: 58
 Please input your guess.
@@ -2401,7 +2416,7 @@ that `return`? If we give a non-number answer, we'll `return` and quit. Observe:
 ```{notrust,ignore}
 $ cargo build
    Compiling guessing_game v0.1.0 (file:/home/you/projects/guessing_game)
-$ ./target/guessing_game 
+$ ./target/guessing_game
 Guess the number!
 The secret number is: 59
 Please input your guess.
@@ -2534,7 +2549,7 @@ Now we should be good! Let's try:
 ```{rust,ignore}
 $ cargo build
    Compiling guessing_game v0.1.0 (file:/home/you/projects/guessing_game)
-$ ./target/guessing_game 
+$ ./target/guessing_game
 Guess the number!
 The secret number is: 61
 Please input your guess.
@@ -2731,16 +2746,6 @@ mod hello {
 
 This will work:
 
-```{notrust,ignore}
-$ cargo build
-   Compiling modules v0.1.0 (file:/home/you/projects/modules)
-$
-```
-
-Before we move on, let me show you one more Cargo command: `run`. `cargo run`
-is kind of like `cargo build`, but it also then runs the produced exectuable.
-Try it out:
-
 ```{notrust,ignore}
 $ cargo run
    Compiling modules v0.1.0 (file:/home/steve/tmp/modules)
@@ -3647,14 +3652,14 @@ In order to truly understand this error, we have to learn a few new concepts:
 All of our references so far have been to variables we've created on the stack.
 In Rust, the simplest way to allocate heap variables is using a *box*.  To
 create a box, use the `box` keyword:
- 
+
 ```{rust}
 let x = box 5i;
 ```
 
 This allocates an integer `5` on the heap, and creates a binding `x` that
 refers to it.. The great thing about boxed pointers is that we don't have to
-manually free this allocation! If we write 
+manually free this allocation! If we write
 
 ```{rust}
 {
@@ -4189,7 +4194,7 @@ the match:
 
 ```{rust,ignore}
 let x = inverse(25.0f64);
-println!("{}", x + 2.0f64); // error: binary operation `+` cannot be applied 
+println!("{}", x + 2.0f64); // error: binary operation `+` cannot be applied
            // to type `core::result::Result<f64,collections::string::String>`
 ```
 
@@ -4700,4 +4705,3 @@ fail.
 # Macros
 
 # Unsafe
-