---

yaml
---
r: 275131
b: refs/heads/stable
c: 8fd7469
h: refs/heads/master
i:
  275129: 2fa710c
  275127: dc7f975

Author: tbu-

[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: d3929b2c8a472244d448feb24f52bf91246d3e82
+refs/heads/stable: 8fd746999041cf8baed0aa8ec72e9124c350bd0a
 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/RELEASES.md

@@ -94,11 +94,11 @@ Misc
   the `-Z unstable-options` flag.
 * [When running tests with `--test`, rustdoc will pass `--cfg`
   arguments to the compiler][1.7dt].
-* [The compiler is built with RPATH information by default][1.7rpa].
+* [The compiler is built with RPATH information by default][1.7rp].
   This means that it will be possible to run `rustc` when installed in
   unusual configurations without configuring the dynamic linker search
   path explicitly.
-* [`rustc` passes `--enable-new-dtags` to GNU ld][1.7dta]. This makes
+* [`rustc` passes `--enable-new-dtags` to GNU ld][1.7dt]. This makes
   any RPATH entries (emitted with `-C rpath`) *not* take precedence
   over `LD_LIBRARY_PATH`.
 
@@ -132,15 +132,15 @@ Compatibility Notes
 [1.7cp]: https://github.com/rust-lang/cargo/pull/2224
 [1.7d]: https://github.com/rust-lang/rust/pull/30724
 [1.7dt]: https://github.com/rust-lang/rust/pull/30372
-[1.7dta]: https://github.com/rust-lang/rust/pull/30394
+[1.7dt]: https://github.com/rust-lang/rust/pull/30394
 [1.7f]: https://github.com/rust-lang/rust/pull/30672
 [1.7h]: https://github.com/rust-lang/rust/pull/30818
 [1.7j]: https://github.com/rust-lang/rust/pull/30711
 [1.7ll]: https://github.com/rust-lang/rust/pull/30663
 [1.7m]: https://github.com/rust-lang/rust/pull/30381
 [1.7p]: https://github.com/rust-lang/rust/pull/30681
 [1.7rp]: https://github.com/rust-lang/rust/pull/29498
-[1.7rpa]: https://github.com/rust-lang/rust/pull/30353
+[1.7rp]: https://github.com/rust-lang/rust/pull/30353
 [1.7rr]: https://github.com/rust-lang/cargo/pull/2279
 [1.7sf]: https://github.com/rust-lang/rust/pull/30389
 [1.7utf8]: https://github.com/rust-lang/rust/pull/30740

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/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/ownership.md

@@ -124,65 +124,21 @@ special annotation here, it’s the default thing that Rust does.
 ## The details
 
 The reason that we cannot use a binding after we’ve moved it is subtle, but
-important. 
-
-When we write code like this:
-
-```rust
-let x = 10;
-```
-
-Rust allocates memory for an integer [i32] on the [stack][sh], copies the bit
-pattern representing the value of 10 to the allocated memory and binds the
-variable name x to this memory region for future reference.
-
-Now consider the following code fragment:
+important. When we write code like this:
 
 ```rust
 let v = vec![1, 2, 3];
 
-let mut v2 = v;
-```
-
-The first line allocates memory for the vector object `v` on the stack like
-it does for `x` above. But in addition to that it also allocates some memory
-on the [heap][sh] for the actual data (`[1, 2, 3]`). Rust copies the address
-of this heap allocation to an internal pointer, which is part of the vector
-object placed on the stack (let's call it the data pointer). 
-
-It is worth pointing out (even at the risk of stating the obvious) that the
-vector object and its data live in separate memory regions instead of being a
-single contiguous memory allocation (due to reasons we will not go into at
-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
-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
-both pointing to the same memory allocation on the heap. It would violate
-Rust’s safety guarantees by introducing a data race if one could access both
-`v` and `v2` at the same time. 
-
-For example if we truncated the vector to just two elements through `v2`:
-
-```rust
-# let v = vec![1, 2, 3];
-# let mut v2 = v;
-v2.truncate(2);
+let v2 = v;
 ```
 
-and `v1` were still accessible we'd end up with an invalid vector since `v1`
-would not know that the heap data has been truncated. Now, the part of the
-vector `v1` on the stack does not agree with the corresponding part on the
-heap. `v1` still thinks there are three elements in the vector and will
-happily let us access the non existent element `v1[2]` but as you might
-already know this is a recipe for disaster. Especially because it might lead
-to a segmentation fault or worse allow an unauthorized user to read from
-memory to which they don't have access.
-
-This is why Rust forbids using `v` after we’ve done the move.
+The first line allocates memory for the vector object, `v`, and for the data it
+contains. The vector object is stored on the [stack][sh] and contains a pointer
+to the content (`[1, 2, 3]`) stored on the [heap][sh]. When we move `v` to `v2`,
+it creates a copy of that pointer, for `v2`. Which means that there would be two
+pointers to the content of the vector on the heap. It would violate Rust’s
+safety guarantees by introducing a data race. Therefore, Rust forbids using `v`
+after we’ve done the move.
 
 [sh]: the-stack-and-the-heap.html
 

branches/stable/src/liballoc/Cargo.toml

@@ -10,3 +10,5 @@ test = false
 
 [dependencies]
 core = { path = "../libcore" }
+libc = { path = "../rustc/libc_shim" }
+alloc_system = { path = "../liballoc_system" }