---

yaml
---
r: 275195
b: refs/heads/stable
c: d4fda66
h: refs/heads/master
i:
  275193: bccf79b
  275191: efa7616

Author: alexcrichton

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 05485be02f25526abeeb1e715abe532a31e0acd6
+refs/heads/stable: d4fda669def560eaa5445adee2ec3725a31848f5
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/.gitmodules

@@ -16,4 +16,4 @@
 	url = https://github.com/rust-lang/rust-installer.git
 [submodule "src/liblibc"]
 	path = src/liblibc
-	url = https://github.com/rust-lang/libc.git
+	url = https://github.com/rust-lang-nursery/libc.git

branches/stable/.mailmap

@@ -82,7 +82,7 @@ Gareth Daniel Smith <garethdanielsmith@gmail.com> Gareth Smith <garethdanielsmit
 Georges Dubus <georges.dubus@gmail.com> <georges.dubus@compiletoi.net>
 Graham Fawcett <graham.fawcett@gmail.com> Graham Fawcett <fawcett@uwindsor.ca>
 Graydon Hoare <graydon@pobox.com> Graydon Hoare <graydon@mozilla.com>
-Guillaume Gomez <guillaume1.gomez@gmail.com> Guillaume Gomez <ggomez@ggo.ifr.lan>
+Guillaume Gomez <guillaume1.gomez@gmail.com>
 Heather <heather@cynede.net> <Cynede@Gentoo.org>
 Heather <heather@cynede.net> <Heather@cynede.net>
 Herman J. Radtke III <herman@hermanradtke.com> Herman J. Radtke III <hermanradtke@gmail.com>

branches/stable/configure

@@ -1327,101 +1327,97 @@ then
     fi
 fi
 
-if [ -z "$CFG_ENABLE_RUSTBUILD" ]; then
+step_msg "making directories"
 
-  step_msg "making directories"
-
-  for i in \
-      doc doc/std doc/extra \
-      dl tmp dist
-  do
-      make_dir $i
-  done
+for i in \
+    doc doc/std doc/extra \
+    dl tmp dist
+do
+    make_dir $i
+done
 
-  for t in $CFG_HOST
-  do
-      make_dir $t/llvm
-  done
+for t in $CFG_HOST
+do
+    make_dir $t/llvm
+done
 
-  for t in $CFG_HOST
-  do
-      make_dir $t/rustllvm
-  done
+for t in $CFG_HOST
+do
+    make_dir $t/rustllvm
+done
 
-  for t in $CFG_TARGET
+for t in $CFG_TARGET
+do
+  make_dir $t/rt
+  for s in 0 1 2 3
   do
-    make_dir $t/rt
-    for s in 0 1 2 3
+    make_dir $t/rt/stage$s
+    make_dir $t/rt/jemalloc
+    make_dir $t/rt/compiler-rt
+    for i in                                          \
+      isaac sync test \
+      arch/i386 arch/x86_64 arch/arm arch/aarch64 arch/mips arch/powerpc
     do
-      make_dir $t/rt/stage$s
-      make_dir $t/rt/jemalloc
-      make_dir $t/rt/compiler-rt
-      for i in                                          \
-        isaac sync test \
-        arch/i386 arch/x86_64 arch/arm arch/aarch64 arch/mips arch/powerpc
-      do
-        make_dir $t/rt/stage$s/$i
-      done
+      make_dir $t/rt/stage$s/$i
     done
   done
+done
 
-  for h in $CFG_HOST
-  do
-      for t in $CFG_TARGET
-      do
-          # host bin dir stage0
-          make_dir $h/stage0/bin
-
-          # host lib dir stage0
-          make_dir $h/stage0/lib
-
-          # host test dir stage0
-          make_dir $h/stage0/test
-
-          # target bin dir stage0
-          make_dir $h/stage0/lib/rustlib/$t/bin
-
-          # target lib dir stage0
-          make_dir $h/stage0/lib/rustlib/$t/lib
-
-          for i in 1 2 3
-          do
-              # host bin dir
-              make_dir $h/stage$i/bin
-
-              # host lib dir
-              make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE
-
-              # host test dir
-              make_dir $h/stage$i/test
-
-              # target bin dir
-              make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/bin
-
-              # target lib dir
-              make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/lib
-          done
-      done
-
-      make_dir $h/test/run-pass
-      make_dir $h/test/run-pass-valgrind
-      make_dir $h/test/run-pass-fulldeps
-      make_dir $h/test/run-fail
-      make_dir $h/test/run-fail-fulldeps
-      make_dir $h/test/compile-fail
-      make_dir $h/test/parse-fail
-      make_dir $h/test/compile-fail-fulldeps
-      make_dir $h/test/bench
-      make_dir $h/test/perf
-      make_dir $h/test/pretty
-      make_dir $h/test/debuginfo-gdb
-      make_dir $h/test/debuginfo-lldb
-      make_dir $h/test/codegen
-      make_dir $h/test/codegen-units
-      make_dir $h/test/rustdoc
-  done
+for h in $CFG_HOST
+do
+    for t in $CFG_TARGET
+    do
+        # host bin dir stage0
+        make_dir $h/stage0/bin
 
-fi
+        # host lib dir stage0
+        make_dir $h/stage0/lib
+
+        # host test dir stage0
+        make_dir $h/stage0/test
+
+        # target bin dir stage0
+        make_dir $h/stage0/lib/rustlib/$t/bin
+
+        # target lib dir stage0
+        make_dir $h/stage0/lib/rustlib/$t/lib
+
+        for i in 1 2 3
+        do
+            # host bin dir
+            make_dir $h/stage$i/bin
+
+            # host lib dir
+            make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE
+
+            # host test dir
+            make_dir $h/stage$i/test
+
+            # target bin dir
+            make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/bin
+
+            # target lib dir
+            make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/lib
+        done
+    done
+
+    make_dir $h/test/run-pass
+    make_dir $h/test/run-pass-valgrind
+    make_dir $h/test/run-pass-fulldeps
+    make_dir $h/test/run-fail
+    make_dir $h/test/run-fail-fulldeps
+    make_dir $h/test/compile-fail
+    make_dir $h/test/parse-fail
+    make_dir $h/test/compile-fail-fulldeps
+    make_dir $h/test/bench
+    make_dir $h/test/perf
+    make_dir $h/test/pretty
+    make_dir $h/test/debuginfo-gdb
+    make_dir $h/test/debuginfo-lldb
+    make_dir $h/test/codegen
+    make_dir $h/test/codegen-units
+    make_dir $h/test/rustdoc
+done
 
 # Configure submodules
 step_msg "configuring submodules"

branches/stable/mk/cfg/arm-unknown-linux-gnueabi.mk

@@ -8,8 +8,8 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).so
 CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).a
 CFG_LIB_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.so
 CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.dylib.dSYM
-CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfloat-abi=soft $(CFLAGS)
-CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfloat-abi=soft $(CFLAGS)
+CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfloat-abi=soft $(CFLAGS) -march=armv6 -marm
+CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfloat-abi=soft $(CFLAGS) -march=armv6 -marm
 CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabi := -fno-rtti $(CXXFLAGS)
 CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabi := -shared -fPIC -g
 CFG_GCCISH_DEF_FLAG_arm-unknown-linux-gnueabi := -Wl,--export-dynamic,--dynamic-list=

branches/stable/mk/cfg/arm-unknown-linux-gnueabihf.mk

@@ -8,8 +8,8 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).so
 CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).a
 CFG_LIB_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.so
 CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.dylib.dSYM
-CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS)
-CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS)
+CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS) -march=armv6 -marm
+CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS) -march=armv6 -marm
 CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabihf := -fno-rtti $(CXXFLAGS)
 CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabihf := -shared -fPIC -g
 CFG_GCCISH_DEF_FLAG_arm-unknown-linux-gnueabihf := -Wl,--export-dynamic,--dynamic-list=

branches/stable/mk/cfg/armv7-unknown-linux-gnueabihf.mk

@@ -21,6 +21,6 @@ CFG_UNIXY_armv7-unknown-linux-gnueabihf := 1
 CFG_LDPATH_armv7-unknown-linux-gnueabihf :=
 CFG_RUN_armv7-unknown-linux-gnueabihf=$(2)
 CFG_RUN_TARG_armv7-unknown-linux-gnueabihf=$(call CFG_RUN_armv7-unknown-linux-gnueabihf,,$(2))
-RUSTC_FLAGS_armv7-unknown-linux-gnueabihf :=
+RUSTC_FLAGS_armv7-unknown-linux-gnueabihf := -C target-feature=+v7,+vfp2,+neon
 RUSTC_CROSS_FLAGS_armv7-unknown-linux-gnueabihf :=
 CFG_GNU_TRIPLE_armv7-unknown-linux-gnueabihf := armv7-unknown-linux-gnueabihf

branches/stable/mk/dist.mk

@@ -48,8 +48,6 @@ PKG_FILES := \
     $(S)configure $(S)Makefile.in              \
     $(S)man                                    \
     $(addprefix $(S)src/,                      \
-      bootstrap                                \
-      build_helper                             \
       compiletest                              \
       doc                                      \
       driver                                   \
@@ -62,7 +60,6 @@ PKG_FILES := \
       rt                                       \
       rtstartup                                \
       rustllvm                                 \
-      rustc                                    \
       snapshots.txt                            \
       rust-installer                           \
       rustbook                                 \

branches/stable/src/bootstrap/build/mod.rs

@@ -160,25 +160,24 @@ impl Build {
         if fs::metadata(self.src.join(".git")).is_err() {
             return
         }
-        let git_submodule = || {
-            let mut cmd = Command::new("git");
-            cmd.current_dir(&self.src).arg("submodule");
-            return cmd
-        };
-        let out = output(git_submodule().arg("status"));
+        let out = output(Command::new("git").arg("submodule").arg("status"));
         if !out.lines().any(|l| l.starts_with("+") || l.starts_with("-")) {
             return
         }
 
-        self.run(git_submodule().arg("sync"));
-        self.run(git_submodule().arg("init"));
-        self.run(git_submodule().arg("update"));
-        self.run(git_submodule().arg("update").arg("--recursive"));
-        self.run(git_submodule().arg("status").arg("--recursive"));
-        self.run(git_submodule().arg("foreach").arg("--recursive")
-                                .arg("git").arg("clean").arg("-fdx"));
-        self.run(git_submodule().arg("foreach").arg("--recursive")
-                                .arg("git").arg("checkout").arg("."));
+        self.run(Command::new("git").arg("submodule").arg("sync"));
+        self.run(Command::new("git").arg("submodule").arg("init"));
+        self.run(Command::new("git").arg("submodule").arg("update"));
+        self.run(Command::new("git").arg("submodule").arg("update")
+                                    .arg("--recursive"));
+        self.run(Command::new("git").arg("submodule").arg("status")
+                                    .arg("--recursive"));
+        self.run(Command::new("git").arg("submodule").arg("foreach")
+                                    .arg("--recursive")
+                                    .arg("git").arg("clean").arg("-fdx"));
+        self.run(Command::new("git").arg("submodule").arg("foreach")
+                                    .arg("--recursive")
+                                    .arg("git").arg("checkout").arg("."));
     }
 
     /// Clear out `dir` if our build has been flagged as dirty, and also set

branches/stable/src/doc/book/guessing-game.md

@@ -258,7 +258,7 @@ done:
     io::stdin().read_line(&mut guess).expect("failed to read line");
 ```
 
-But that gets hard to read. So we’ve split it up, two lines for two method
+But that gets hard to read. So we’ve split it up, three lines for three method
 calls. We already talked about `read_line()`, but what about `expect()`? Well,
 we already mentioned that `read_line()` puts what the user types into the `&mut
 String` we pass it. But it also returns a value: in this case, an
@@ -644,7 +644,7 @@ So far, that hasn’t mattered, and so Rust defaults to an `i32`. However, here,
 Rust doesn’t know how to compare the `guess` and the `secret_number`. They
 need to be the same type. Ultimately, we want to convert the `String` we
 read as input into a real number type, for comparison. We can do that
-with two more lines. Here’s our new program:
+with three more lines. Here’s our new program:
 
 ```rust,ignore
 extern crate rand;

branches/stable/src/doc/book/iterators.md

@@ -311,12 +311,10 @@ for i in (1..100).filter(|&x| x % 2 == 0) {
 ```
 
 This will print all of the even numbers between one and a hundred.
-(Note that, unlike `map`, the closure passed to `filter` is passed a reference
-to the element instead of the element itself. The filter predicate here uses
-the `&x` pattern to extract the integer. The filter closure is passed a
-reference because it returns `true` or `false` instead of the element,
-so the `filter` implementation must retain ownership to put the elements
-into the newly constructed iterator.)
+(Note that because `filter` doesn't consume the elements that are
+being iterated over, it is passed a reference to each element, and
+thus the filter predicate uses the `&x` pattern to extract the integer
+itself.)
 
 You can chain all three things together: start with an iterator, adapt it
 a few times, and then consume the result. Check it out:

branches/stable/src/doc/book/ownership.md

@@ -157,7 +157,7 @@ this point of time). These two parts of the vector (the one on the stack and
 one on the heap) must agree with each other at all times with regards to
 things like the length, capacity etc.
 
-When we move `v` to `v2`, Rust actually does a bitwise copy of the vector
+When we move `v` to `v2`, rust actually does a bitwise copy of the vector
 object `v` into the stack allocation represented by `v2`. This shallow copy
 does not create a copy of the heap allocation containing the actual data.
 Which means that there would be two pointers to the contents of the vector

branches/stable/src/doc/nomicon/other-reprs.md

@@ -57,7 +57,7 @@ These reprs have no effect on a struct.
 
 # repr(packed)
 
-`repr(packed)` forces Rust to strip any padding, and only align the type to a
+`repr(packed)` forces rust to strip any padding, and only align the type to a
 byte. This may improve the memory footprint, but will likely have other negative
 side-effects.
 

branches/stable/src/doc/reference.md

@@ -841,8 +841,8 @@ extern crate std as ruststd; // linking to 'std' under another name
 
 A _use declaration_ creates one or more local name bindings synonymous with
 some other [path](#paths). Usually a `use` declaration is used to shorten the
-path required to refer to a module item. These declarations may appear in
-[modules](#modules) and [blocks](grammar.html#block-expressions), usually at the top.
+path required to refer to a module item. These declarations may appear at the
+top of [modules](#modules) and [blocks](grammar.html#block-expressions).
 
 > **Note**: Unlike in many languages,
 > `use` declarations in Rust do *not* declare linkage dependency with external crates.
@@ -1764,7 +1764,7 @@ pub mod submodule {
 # fn main() {}
 ```
 
-For a Rust program to pass the privacy checking pass, all paths must be valid
+For a rust program to pass the privacy checking pass, all paths must be valid
 accesses given the two rules above. This includes all use statements,
 expressions, types, etc.
 
@@ -3564,9 +3564,8 @@ Each instance of a trait object includes:
    each method of `SomeTrait` that `T` implements, a pointer to `T`'s
    implementation (i.e. a function pointer).
 
-The purpose of trait objects is to permit "late binding" of methods. Calling a
-method on a trait object results in virtual dispatch at runtime: that is, a
-function pointer is loaded from the trait object vtable and invoked indirectly.
+The purpose of trait objects is to permit "late binding" of methods. A call to
+a method on a trait object is only resolved to a vtable entry at compile time.
 The actual implementation for each vtable entry can vary on an object-by-object
 basis.
 

branches/stable/src/etc/licenseck.py

@@ -9,7 +9,6 @@
 # except according to those terms.
 
 import re
-import os
 
 license_re = re.compile(
 u"""(#|//) Copyright .* The Rust Project Developers. See the COPYRIGHT
@@ -41,9 +40,8 @@
 ]
 
 def check_license(name, contents):
-    name = os.path.normpath(name)
     # Whitelist check
-    if any(name.endswith(os.path.normpath(e)) for e in exceptions):
+    if any(name.endswith(e) for e in exceptions):
         return True
 
     # Xfail check