---

yaml
---
r: 132991
b: refs/heads/dist-snap
c: 6843d8c
h: refs/heads/master
i:
  132989: f63984a
  132987: 0f3c6be
  132983: 846f4b6
  132975: 3171356
  132959: 40c1fee
  132927: 067d322
  132863: d86ac76
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 457a3c991d79b971be07fce75f9d0c12848fb37c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 68811817f723e57354b0137b1c9bc6b28016ecbc
+refs/heads/dist-snap: 6843d8ccd562c5c5d45c0bba570908d5aa765610
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/configure

@@ -635,7 +635,7 @@ then
     LLVM_VERSION=$($LLVM_CONFIG --version)
 
     case $LLVM_VERSION in
-        (3.[2-5]*)
+        (3.[2-6]*)
             msg "found ok version of LLVM: $LLVM_VERSION"
             ;;
         (*)

branches/dist-snap/src/libcollections/priority_queue.rs

@@ -529,10 +529,9 @@ impl<'a, T> Iterator<&'a T> for Items<'a, T> {
 }
 
 impl<T: Ord> FromIterator<T> for PriorityQueue<T> {
-    fn from_iter<Iter: Iterator<T>>(iter: Iter) -> PriorityQueue<T> {
-        let mut q = PriorityQueue::new();
-        q.extend(iter);
-        q
+    fn from_iter<Iter: Iterator<T>>(mut iter: Iter) -> PriorityQueue<T> {
+        let vec: Vec<T> = iter.collect();
+        PriorityQueue::from_vec(vec)
     }
 }
 

branches/dist-snap/src/liblibc/lib.rs

@@ -1356,8 +1356,16 @@ pub mod types {
             pub mod c99 {
                 pub type c_longlong = i64;
                 pub type c_ulonglong = u64;
+
+                #[cfg(target_arch = "x86")]
                 pub type intptr_t = i32;
+                #[cfg(target_arch = "x86_64")]
+                pub type intptr_t = i64;
+
+                #[cfg(target_arch = "x86")]
                 pub type uintptr_t = u32;
+                #[cfg(target_arch = "x86_64")]
+                pub type uintptr_t = u64;
             }
 
             pub mod posix88 {

branches/dist-snap/src/librustc/middle/borrowck/gather_loans/restrictions.rs

@@ -70,18 +70,19 @@ impl<'a> RestrictionsContext<'a> {
             mc::cat_arg(local_id) => {
                 // R-Variable, locally declared
                 let lp = Rc::new(LpVar(local_id));
-                SafeIf(lp.clone(), vec!(lp))
+                SafeIf(lp.clone(), vec![lp])
             }
 
             mc::cat_upvar(upvar_id, _) => {
                 // R-Variable, captured into closure
                 let lp = Rc::new(LpUpvar(upvar_id));
-                SafeIf(lp.clone(), vec!(lp))
+                SafeIf(lp.clone(), vec![lp])
             }
 
-            mc::cat_copied_upvar(..) => {
-                // FIXME(#2152) allow mutation of upvars
-                Safe
+            mc::cat_copied_upvar(mc::CopiedUpvar { upvar_id, .. }) => {
+                // R-Variable, copied/moved into closure
+                let lp = Rc::new(LpVar(upvar_id));
+                SafeIf(lp.clone(), vec![lp])
             }
 
             mc::cat_downcast(cmt_base) => {

branches/dist-snap/src/libsyntax/parse/mod.rs

@@ -412,14 +412,21 @@ pub fn str_lit(lit: &str) -> String {
     loop {
         match chars.next() {
             Some((i, c)) => {
-                let em = error(i);
                 match c {
                     '\\' => {
-                        if chars.peek().expect(em.as_slice()).val1() == '\n' {
+                        let ch = chars.peek().unwrap_or_else(|| {
+                            fail!("{}", error(i).as_slice())
+                        }).val1();
+
+                        if ch == '\n' {
                             eat(&mut chars);
-                        } else if chars.peek().expect(em.as_slice()).val1() == '\r' {
+                        } else if ch == '\r' {
                             chars.next();
-                            if chars.peek().expect(em.as_slice()).val1() != '\n' {
+                            let ch = chars.peek().unwrap_or_else(|| {
+                                fail!("{}", error(i).as_slice())
+                            }).val1();
+
+                            if ch != '\n' {
                                 fail!("lexer accepted bare CR");
                             }
                             eat(&mut chars);
@@ -433,7 +440,11 @@ pub fn str_lit(lit: &str) -> String {
                         }
                     },
                     '\r' => {
-                        if chars.peek().expect(em.as_slice()).val1() != '\n' {
+                        let ch = chars.peek().unwrap_or_else(|| {
+                            fail!("{}", error(i).as_slice())
+                        }).val1();
+
+                        if ch != '\n' {
                             fail!("lexer accepted bare CR");
                         }
                         chars.next();

branches/dist-snap/src/test/compile-fail/cannot-mutate-captured-non-mut-var.rs

@@ -12,4 +12,8 @@ fn main() {
     let x = 1i;
     proc() { x = 2; };
     //~^ ERROR: cannot assign to immutable captured outer variable in a proc `x`
+
+    let s = std::io::stdin();
+    proc() { s.lines(); };
+    //~^ ERROR: cannot borrow immutable captured outer variable in a proc `s` as mutable
 }

branches/dist-snap/src/test/run-pass/issue-16671.rs

@@ -0,0 +1,24 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![forbid(warnings)]
+
+// Pretty printing tests complain about `use std::predule::*`
+#![allow(unused_imports)]
+
+// A var moved into a proc, that has a mutable loan path should
+// not trigger a misleading unused_mut warning.
+
+pub fn main() {
+    let mut stdin = std::io::stdin();
+    spawn(proc() {
+        let _ = stdin.lines();
+    });
+}