---

yaml
---
r: 127934
b: refs/heads/master
c: 604af3f
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: bf0a925dcde7a2c66df4e05661a9b1d1472435ab
+refs/heads/master: 604af3f6c0be6ea428a55cfcb303fa1cd1c7958d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: aa98b25c4f0c10729dff37c699904ad57b8fbda8
 refs/heads/try: f1778314378f8951328206626b5ddf725898e0e6

trunk/src/compiletest/runtest.rs

@@ -16,8 +16,7 @@ use header::TestProps;
 use header;
 use procsrv;
 use util::logv;
-#[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
+#[cfg(target_os = "win32")]
 use util;
 
 use std::io::File;
@@ -818,8 +817,7 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
         format!("{}:{}:", testfile.display(), ee.line)
     }).collect::<Vec<String> >();
 
-    #[cfg(target_os = "windows")]
-    #[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
+    #[cfg(target_os = "win32")]
     fn to_lower( s : &str ) -> String {
         let i = s.chars();
         let c : Vec<char> = i.map( |c| {
@@ -832,8 +830,7 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
         String::from_chars(c.as_slice())
     }
 
-    #[cfg(target_os = "windows")]
-    #[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
+    #[cfg(target_os = "win32")]
     fn prefix_matches( line : &str, prefix : &str ) -> bool {
         to_lower(line).as_slice().starts_with(to_lower(prefix).as_slice())
     }
@@ -1250,16 +1247,14 @@ fn make_cmdline(_libpath: &str, prog: &str, args: &[String]) -> String {
     format!("{} {}", prog, args.connect(" "))
 }
 
-#[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
+#[cfg(target_os = "win32")]
 fn make_cmdline(libpath: &str, prog: &str, args: &[String]) -> String {
     format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" "))
 }
 
 // Build the LD_LIBRARY_PATH variable as it would be seen on the command line
 // for diagnostic purposes
-#[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
+#[cfg(target_os = "win32")]
 fn lib_path_cmd_prefix(path: &str) -> String {
     format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path))
 }

trunk/src/compiletest/util.rs

@@ -10,15 +10,13 @@
 
 use common::Config;
 
-#[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
+#[cfg(target_os = "win32")]
 use std::os::getenv;
 
 /// Conversion table from triple OS name to Rust SYSNAME
 static OS_TABLE: &'static [(&'static str, &'static str)] = &[
-    ("mingw32", "windows"),
-    ("win32", "windows"),
-    ("windows", "windows"),
+    ("mingw32", "win32"),
+    ("win32", "win32"),
     ("darwin", "macos"),
     ("android", "android"),
     ("linux", "linux"),
@@ -35,8 +33,7 @@ pub fn get_os(triple: &str) -> &'static str {
     fail!("Cannot determine OS from triple");
 }
 
-#[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
+#[cfg(target_os = "win32")]
 pub fn make_new_path(path: &str) -> String {
 
     // Windows just uses PATH as the library search path, so we have to
@@ -49,12 +46,10 @@ pub fn make_new_path(path: &str) -> String {
     }
 }
 
-#[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
+#[cfg(target_os = "win32")]
 pub fn lib_path_env_var() -> &'static str { "PATH" }
 
-#[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
+#[cfg(target_os = "win32")]
 pub fn path_div() -> &'static str { ";" }
 
 pub fn logv(config: &Config, s: String) {

trunk/src/doc/guide.md

@@ -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,21 +1796,6 @@ 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
@@ -1948,19 +1933,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.
@@ -2001,7 +1986,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.
@@ -2037,7 +2022,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!"); },
@@ -2121,7 +2106,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.
@@ -2272,7 +2257,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.
@@ -2338,7 +2323,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.
@@ -2416,7 +2401,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.
@@ -2549,7 +2534,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.
@@ -2746,6 +2731,16 @@ 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)
@@ -3652,14 +3647,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}
 {
@@ -4194,7 +4189,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>`
 ```
 
@@ -4705,3 +4700,4 @@ fail.
 # Macros
 
 # Unsafe
+

trunk/src/doc/rust.md

@@ -919,7 +919,7 @@ extern crate foo = "some/where/rust-foo#foo:1.0"; // a full crate ID for externa
 ##### Use declarations
 
 ~~~~ {.ebnf .gram}
-use_decl : "pub" ? "use" [ path "as" ident
+use_decl : "pub" ? "use" [ ident '=' path
                           | path_glob ] ;
 
 path_glob : ident [ "::" [ path_glob
@@ -939,7 +939,7 @@ module item. These declarations may appear at the top of [modules](#modules) and
 
 Use declarations support a number of convenient shortcuts:
 
-  * Rebinding the target name as a new local name, using the syntax `use p::q::r as x;`.
+  * Rebinding the target name as a new local name, using the syntax `use x = p::q::r;`.
   * Simultaneously binding a list of paths differing only in their final element,
     using the glob-like brace syntax `use a::b::{c,d,e,f};`
   * Binding all paths matching a given prefix, using the asterisk wildcard syntax `use a::b::*;`

trunk/src/etc/mklldeps.py

@@ -61,15 +61,13 @@ def run(args):
     elif 'android' in os:
         os = 'android'
     elif 'win' in os or 'mingw' in os:
-        os = 'windows'
+        os = 'win32'
     cfg = [
         "target_arch = \"" + arch + "\"",
         "target_os = \"" + os + "\"",
     ]
 
     f.write("#[cfg(" + ', '.join(cfg) + ")]\n")
-    if os == "windows": # NOTE: Remove after snapshot
-        f.write("#[cfg(stage0, target_arch = \"%s\", target_os = \"win32\")]\n" % (arch,))
 
     version = run([llconfig, '--version']).strip()
 

trunk/src/etc/vim/after/syntax/rust.vim

@@ -29,3 +29,5 @@ hi link rustNiceOperator Operator
 if !exists('g:rust_conceal_mod_path')
     hi! link Conceal Operator
 endif
+
+setlocal conceallevel=2

trunk/src/etc/vim/ftplugin/rust.vim

@@ -56,11 +56,6 @@ if exists("g:loaded_delimitMate")
 	let b:delimitMate_excluded_regions = delimitMate#Get("excluded_regions") . ',rustLifetimeCandidate,rustGenericLifetimeCandidate'
 endif
 
-if has('conceal') && exists('g:rust_conceal')
-	let b:rust_set_conceallevel=1
-	setlocal conceallevel=2
-endif
-
 " Motion Commands {{{1
 
 " Bind motion commands to support hanging indents
@@ -108,10 +103,6 @@ let b:undo_ftplugin = "
 		\|else
 		  \|unlet! b:delimitMate_excluded_regions
 		\|endif
-		\|if exists('b:rust_set_conceallevel')
-		  \|setlocal conceallevel<
-		  \|unlet b:rust_set_conceallevel
-		\|endif
 		\|unlet! b:rust_last_rustc_args b:rust_last_args
 		\|delcommand RustRun
 		\|delcommand RustExpand