---

yaml
---
r: 235447
b: refs/heads/stable
c: e6e6368
h: refs/heads/master
i:
  235445: 3c63d8b
  235443: 4d014d3
  235439: 40ccdb8
v: v3

Author: nrc

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 2c49927ae4c125d55f1c49b590a714428b823d9c
+refs/heads/stable: e6e636845472cb843d978ae865317fae08e50a74
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/.travis.yml

@@ -1,38 +1,20 @@
-# ccache support is disabled unless your language is a C-derivative. However
-# `language: C` unconditionally sets `CC=compiler`. If we just set it in our
-# `env` it will be overwritten by the default (gcc 4.6).
+# Use something that's not 'ruby' so we don't set up things like
+# RVM/bundler/ruby and whatnot. Right now 'rust' as a language actually
+# downloads a rust/cargo snapshot, which we don't really want for building rust.
 language: c
-compiler: /usr/bin/gcc-4.7
-cache: ccache
 sudo: false
 
 # The test suite is in general way too stressful for travis, especially in
 # terms of time limit and reliability. In the past we've tried to scale things
 # back to only build the stage1 compiler and run a subset of tests, but this
 # didn't end up panning out very well.
 #
-# As a result, we're just using travis to run `make tidy` and *only* build
-# stage1 but *not* test it for now (a strict subset of the bootstrap). This will
-# catch "obvious" errors like style or not even compiling.
-#
-# We need gcc4.7 or higher to build LLVM, and travis (well, Ubuntu 12.04)
-# currently ships with 4.6. Gotta download our own.
+# As a result, we're just using travis to run `make tidy` now. It'll help
+# everyone find out about their trailing spaces early on!
 before_script:
-  - ./configure --enable-ccache
+  - ./configure --llvm-root=path/to/nowhere
 script:
   - make tidy
-  - make rustc-stage1 -j4
-
-env:
-  - CXX=/usr/bin/g++-4.7
-
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - gcc-4.7
-    - g++-4.7
 
 # Real testing happens on http://buildbot.rust-lang.org/
 #

branches/stable/CONTRIBUTING.md

@@ -133,8 +133,8 @@ Documentation improvements are very welcome. The source of `doc.rust-lang.org`
 is located in `src/doc` in the tree, and standard API documentation is generated
 from the source code itself.
 
-Documentation pull requests function in the same way as other pull requests,
-though you may see a slightly different form of `r+`:
+Documentation pull requests function in the same as other pull requests, though
+you may see a slightly different form of `r+`:
 
     @bors: r+ 38fe8d2 rollup
 

branches/stable/RELEASES.md

@@ -28,9 +28,6 @@ Breaking Changes
   in, and the same value reported by clang's
   `alignof`. [`mem::min_align_of`] is deprecated. This is not known to
   break real code.
-* [The `#[packed]` attribute is no longer silently accepted by the
-  compiler][packed]. This attribute did nothing and code that
-  mentioned it likely did not work as intended.
 
 Language
 --------
@@ -143,7 +140,7 @@ Misc
 [fat]: https://github.com/rust-lang/rust/pull/26411
 [dst]: https://github.com/rust-lang/rfcs/blob/master/text/0982-dst-coercion.md
 [parcodegen]: https://github.com/rust-lang/rust/pull/26018
-[packed]: https://github.com/rust-lang/rust/pull/25541
+
 
 Version 1.1.0 (June 2015)
 =========================

branches/stable/configure

@@ -1031,12 +1031,15 @@ fi
 
 if [ ! -z "$CFG_ENABLE_CCACHE" ]
 then
-    if [ -z "$CFG_CCACHE" ]
+    if [ -z "$CC" ]
     then
-        err "ccache requested but not found"
-    fi
+        if [ -z "$CFG_CCACHE" ]
+        then
+            err "ccache requested but not found"
+        fi
 
-    CFG_CC="ccache $CFG_CC"
+        CFG_CC="ccache $CFG_CC"
+    fi
 fi
 
 if [ -z "$CC" -a -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
@@ -1525,26 +1528,11 @@ do
 
             (*)
             msg "inferring LLVM_CXX/CC from CXX/CC = $CXX/$CC"
-            if [ ! -z "$CFG_ENABLE_CCACHE" ]
-            then
-                if [ -z "$CFG_CCACHE" ]
-                then
-                    err "ccache requested but not found"
-                fi
-
-                LLVM_CXX_32="ccache $CXX"
-                LLVM_CC_32="ccache $CC"
-
-                LLVM_CXX_64="ccache $CXX"
-                LLVM_CC_64="ccache $CC"
-            else
-                LLVM_CXX_32="$CXX"
-                LLVM_CC_32="$CC"
-
-                LLVM_CXX_64="$CXX"
-                LLVM_CC_64="$CC"
-            fi
+            LLVM_CXX_32="$CXX"
+            LLVM_CC_32="$CC"
 
+            LLVM_CXX_64="$CXX"
+            LLVM_CC_64="$CC"
             ;;
         esac
 

branches/stable/src/doc/trpl/error-handling.md

@@ -50,8 +50,6 @@ is very wrong. Wrong enough that we can't continue with things in the current
 state. Another example is using the `unreachable!()` macro:
 
 ```rust,ignore
-use Event::NewRelease;
-
 enum Event {
     NewRelease,
 }
@@ -73,7 +71,7 @@ fn descriptive_probability(event: Event) -> &'static str {
 }
 
 fn main() {
-    println!("{}", descriptive_probability(NewRelease));
+    std::io::println(descriptive_probability(NewRelease));
 }
 ```
 

branches/stable/src/doc/trpl/inline-assembly.md

@@ -103,7 +103,7 @@ fn main() {
 If you would like to use real operands in this position, however,
 you are required to put curly braces `{}` around the register that
 you want, and you are required to put the specific size of the
-operand. This is useful for very low level programming, where
+operand. This is useful for very low level programming, where 
 which register you use is important:
 
 ```rust
@@ -166,12 +166,3 @@ unsafe {
 println!("eax is currently {}", result);
 # }
 ```
-
-## More Information
-
-The current implementation of the `asm!` macro is a direct binding to [LLVM's
-inline assembler expressions][llvm-docs], so be sure to check out [their
-documentation as well][llvm-docs] for more information about clobbers,
-constraints, etc.
-
-[llvm-docs]: http://llvm.org/docs/LangRef.html#inline-assembler-expressions

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

@@ -42,8 +42,8 @@ With that in mind, let’s learn about ownership.
 # Ownership
 
 [Variable bindings][bindings] have a property in Rust: they ‘have ownership’
-of what they’re bound to. This means that when a binding goes out of scope, 
-Rust will free the bound resources. For example:
+of what they’re bound to. This means that when a binding goes out of scope, the
+resource that they’re bound to are freed. For example:
 
 ```rust
 fn foo() {

branches/stable/src/doc/trpl/the-stack-and-the-heap.md

@@ -176,7 +176,7 @@ After `bar()` is over, its frame is deallocated, leaving just `foo()` and
 | 1       | a    | 5     |
 | 0       | x    | 42    |
 
-And then `foo()` ends, leaving just `main()`:
+And then `foo()` ends, leaving just `main()`
 
 | Address | Name | Value |
 |---------|------|-------|
@@ -537,7 +537,7 @@ Generally, you should prefer stack allocation, and so, Rust stack-allocates by
 default. The LIFO model of the stack is simpler, at a fundamental level. This
 has two big impacts: runtime efficiency and semantic impact.
 
-## Runtime Efficiency
+## Runtime Efficiency.
 
 Managing the memory for the stack is trivial: The machine just
 increments or decrements a single value, the so-called “stack pointer”.

branches/stable/src/librustc/diagnostics.rs

@@ -972,16 +972,16 @@ Updates to the borrow checker in a future version of Rust may remove this
 restriction, but for now patterns must be rewritten without sub-bindings.
 
 ```
-// Before.
-match Some("hi".to_string()) {
-    ref op_string_ref @ Some(ref s) => ...
+// Code like this...
+match Some(5) {
+    ref op_num @ Some(num) => ...
     None => ...
 }
 
 // After.
 match Some("hi".to_string()) {
     Some(ref s) => {
-        let op_string_ref = &Some(s);
+        let op_string_ref = &Some(&s);
         ...
     }
     None => ...

branches/stable/src/librustc_trans/save/mod.rs

@@ -753,6 +753,6 @@ fn escape(s: String) -> String {
 
 // If the expression is a macro expansion or other generated code, run screaming
 // and don't index.
-fn generated_code(span: Span) -> bool {
+pub fn generated_code(span: Span) -> bool {
     span.expn_id != NO_EXPANSION || span  == DUMMY_SP
 }

branches/stable/src/librustdoc/html/static/main.css

@@ -128,9 +128,6 @@ code, pre {
     border-radius: 3px;
     padding: 0 0.2em;
 }
-.docblock pre code {
-    padding: 0;
-}
 pre {
     background-color: #F5F5F5;
     padding: 14px;

branches/stable/src/librustdoc/html/static/main.js

@@ -951,8 +951,3 @@
     }());
 
 }());
-
-// Sets the focus on the search bar at the top of the page
-function focusSearchBar() {
-    document.getElementsByName('search')[0].focus();
-}

branches/stable/src/libstd/io/buffered.rs

@@ -18,6 +18,7 @@ use cmp;
 use error;
 use fmt;
 use io::{self, DEFAULT_BUF_SIZE, Error, ErrorKind, SeekFrom};
+use ptr;
 
 /// The `BufReader` struct adds buffering to any reader.
 ///
@@ -307,8 +308,14 @@ impl<W: Write> BufWriter<W> {
             }
         }
         if written > 0 {
-            self.buf.drain(..written);
+            // NB: would be better expressed as .remove(0..n) if it existed
+            unsafe {
+                ptr::copy(self.buf.as_ptr().offset(written as isize),
+                          self.buf.as_mut_ptr(),
+                          len - written);
+            }
         }
+        self.buf.truncate(len - written);
         ret
     }