---

yaml
---
r: 174635
b: refs/heads/snap-stage3
c: 35d46fa
h: refs/heads/master
i:
  174633: e0e4a4c
  174631: 44a32c5
v: v3

Author: benjaminp

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: a0f86de49748b472d4d189d9688b0d856c000914
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: d8a892303cab952b1af787122e5551bce95d8770
+refs/heads/snap-stage3: 35d46fabaf63c0b1b607bd91cd5680eeaa2f9a14
 refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/LICENSE-MIT

@@ -1,4 +1,4 @@
-Copyright (c) 2015 The Rust Project Developers
+Copyright (c) 2014 The Rust Project Developers
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated

branches/snap-stage3/configure

@@ -612,7 +612,7 @@ putvar CFG_RELEASE_CHANNEL
 # channel.
 # Basing CFG_BOOTSTRAP_KEY on CFG_BOOTSTRAP_KEY lets it get picked up
 # during a Makefile reconfig.
-CFG_BOOTSTRAP_KEY="${CFG_BOOTSTRAP_KEY-`date +%H:%M:%S`}"
+CFG_BOOTSTRAP_KEY="${CFG_BOOTSTRAP_KEY-`date +%N`}"
 putvar CFG_BOOTSTRAP_KEY
 
 step_msg "looking for build programs"

branches/snap-stage3/mk/crates.mk

@@ -52,7 +52,7 @@
 TARGET_CRATES := libc std flate arena term \
                  serialize getopts collections test rand \
                  log regex graphviz core rbml alloc \
-                 unicode rustc_bitflags
+                 unicode
 RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
                 rustc_trans rustc_back rustc_llvm rustc_privacy
 HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc fmt_macros
@@ -64,8 +64,7 @@ DEPS_libc := core
 DEPS_unicode := core
 DEPS_alloc := core libc native:jemalloc
 DEPS_std := core libc rand alloc collections unicode \
-	native:rust_builtin native:backtrace native:rustrt_native \
-	rustc_bitflags
+	native:rust_builtin native:backtrace native:rustrt_native
 DEPS_graphviz := std
 DEPS_syntax := std term serialize log fmt_macros arena libc
 DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
@@ -84,7 +83,6 @@ DEPS_rustc_llvm := native:rustllvm libc std
 DEPS_rustc_back := std syntax rustc_llvm flate log libc
 DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
                 test
-DEPS_rustc_bitflags := core
 DEPS_flate := std native:miniz
 DEPS_arena := std
 DEPS_graphviz := std
@@ -116,7 +114,6 @@ ONLY_RLIB_alloc := 1
 ONLY_RLIB_rand := 1
 ONLY_RLIB_collections := 1
 ONLY_RLIB_unicode := 1
-ONLY_RLIB_rustc_bitflags := 1
 
 ################################################################################
 # You should not need to edit below this line

branches/snap-stage3/mk/main.mk

@@ -330,10 +330,10 @@ ifdef CFG_DISABLE_UNSTABLE_FEATURES
 CFG_INFO := $(info cfg: disabling unstable features (CFG_DISABLE_UNSTABLE_FEATURES))
 # Turn on feature-staging
 export CFG_DISABLE_UNSTABLE_FEATURES
-# Subvert unstable feature lints to do the self-build
-export RUSTC_BOOTSTRAP_KEY:=$(CFG_BOOTSTRAP_KEY)
 endif
+# Subvert unstable feature lints to do the self-build
 export CFG_BOOTSTRAP_KEY
+export RUSTC_BOOTSTRAP_KEY:=$(CFG_BOOTSTRAP_KEY)
 
 ######################################################################
 # Per-stage targets and runner

branches/snap-stage3/mk/tests.mk

@@ -1011,8 +1011,7 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
 	    $$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3)) \
 	    "$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3))" \
 	    "$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))" \
-	    $(1) \
-	    $$(S)
+	    $(1)
 	@touch $$@
 else
 # FIXME #11094 - The above rule doesn't work right for multiple targets

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

@@ -13,7 +13,6 @@
 #![feature(slicing_syntax, unboxed_closures)]
 #![feature(box_syntax)]
 #![feature(int_uint)]
-#![allow(unstable)]
 
 #![deny(warnings)]
 

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

@@ -1,4 +1,4 @@
 % The (old) Rust Crates and Modules Guide
 
-This content has moved into
+This content has moved into the
 [the Rust Programming Language book](book/crates-and-modules.html).

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

@@ -1,4 +1,4 @@
 % Error Handling in Rust
 
-This content has moved into
+This content has moved into the
 [the Rust Programming Language book](book/error-handling.html).

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

@@ -1,4 +1,4 @@
 % The (old) Rust Foreign Function Interface Guide
 
-This content has moved into
+This content has moved into the
 [the Rust Programming Language book](book/ffi.html).

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

@@ -1,4 +1,4 @@
 % The (old) Rust Macros Guide
 
-This content has moved into
+This content has moved into the
 [the Rust Programming Language book](book/macros.html).

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

@@ -1,4 +1,4 @@
 % The (old) Rust Ownership Guide
 
-This content has moved into
+This content has moved into the
 [the Rust Programming Language book](book/ownership.html).

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

@@ -1,4 +1,4 @@
 % The (old) Rust Compiler Plugins Guide
 
-This content has moved into
+This content has moved into the
 [the Rust Programming Language book](book/plugins.html).

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

@@ -1,4 +1,4 @@
 % The (old) Rust Pointer Guide
 
-This content has moved into
+This content has moved into the
 [the Rust Programming Language book](book/pointers.html).

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

@@ -1,4 +1,4 @@
 % The (old) Guide to Rust Strings
 
-This content has moved into
+This content has moved into the
 [the Rust Programming Language book](book/strings.html).

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

@@ -1,4 +1,4 @@
 % The (old) Rust Threads and Communication Guide
 
-This content has moved into
+This content has moved into the
 [the Rust Programming Language book](book/tasks.html).

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

@@ -1,4 +1,4 @@
 % The (old) Rust Testing Guide
 
-This content has moved into
+This content has moved into the
 [the Rust Programming Language book](book/testing.html).

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

@@ -1,4 +1,4 @@
 % Writing Safe Low-level and Unsafe Code in Rust
 
-This content has moved into
+This content has moved into the
 [the Rust Programming Language book](book/unsafe.html).

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

@@ -1,4 +1,4 @@
 % The (old) Rust Guide
 
-This content has moved into
+This content has moved into the
 [the Rust Programming Language book](book/README.html).

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

@@ -424,11 +424,11 @@ Let's see an example. This Rust code will not compile:
 use std::thread::Thread;
 
 fn main() {
-    let mut numbers = vec![1is, 2, 3];
+    let mut numbers = vec![1i, 2i, 3i];
 
-    for i in 0..3 {
+    for i in range(0u, 3u) {
         Thread::spawn(move || {
-            for j in 0..3 { numbers[j] += 1 }
+            for j in range(0, 3) { numbers[j] += 1 }
         });
     }
 }
@@ -438,15 +438,15 @@ It gives us this error:
 
 ```text
 6:71 error: capture of moved value: `numbers`
-    for j in 0..3 { numbers[j] += 1 }
-                    ^~~~~~~
+    for j in range(0, 3) { numbers[j] += 1 }
+               ^~~~~~~
 7:50 note: `numbers` moved into closure environment here
     spawn(move || {
-        for j in 0..3 { numbers[j] += 1 }
+        for j in range(0, 3) { numbers[j] += 1 }
     });
 6:79 error: cannot assign to immutable dereference (dereference is implicit, due to indexing)
-        for j in 0..3 { numbers[j] += 1 }
-                        ^~~~~~~~~~~~~~~
+        for j in range(0, 3) { numbers[j] += 1 }
+                           ^~~~~~~~~~~~~~~
 ```
 
 It mentions that "numbers moved into closure environment". Because we
@@ -478,9 +478,9 @@ use std::thread::Thread;
 use std::sync::{Arc,Mutex};
 
 fn main() {
-    let numbers = Arc::new(Mutex::new(vec![1is, 2, 3]));
+    let numbers = Arc::new(Mutex::new(vec![1i, 2i, 3i]));
 
-    for i in 0..3 {
+    for i in range(0u, 3u) {
         let number = numbers.clone();
         Thread::spawn(move || {
             let mut array = number.lock().unwrap();
@@ -541,12 +541,12 @@ safety check that makes this an error about moved values:
 use std::thread::Thread;
 
 fn main() {
-    let vec = vec![1is, 2, 3];
+    let vec = vec![1i, 2, 3];
 
-    for i in 0us..3 {
+    for i in range(0u, 3) {
         Thread::spawn(move || {
             println!("{}", vec[i]);
-        });
+        }).detach();
     }
 }
 ```
@@ -557,9 +557,9 @@ you can remove it. As an example, this is a poor way to iterate through
 a vector:
 
 ```{rust}
-let vec = vec![1, 2, 3];
+let vec = vec![1i, 2, 3];
 
-for i in 0..vec.len() {
+for i in range(0u, vec.len()) {
      println!("{}", vec[i]);
 }
 ```
@@ -569,7 +569,7 @@ that we don't try to access an invalid index. However, we can remove this
 while retaining safety. The answer is iterators:
 
 ```{rust}
-let vec = vec![1, 2, 3];
+let vec = vec![1i, 2, 3];
 
 for x in vec.iter() {
     println!("{}", x);