---

yaml
---
r: 129491
b: refs/heads/snap-stage3
c: 119f8b4
h: refs/heads/master
i:
  129489: 74cb765
  129487: f5b8a03
v: v3

Author: vadimcn

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 566b470e138e929e8a93d613372db1ba177c494f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: a2842407839f0a98283394d03c794d9bd5372c89
+refs/heads/snap-stage3: 119f8b46948643176f07055be8b81fc48d957614
 refs/heads/try: 80b45ddbd351f0a4a939c3a3c4e20b4defec4b35
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/configure

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

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

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

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

@@ -1357,8 +1357,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/snap-stage3/src/librustc/middle/borrowck/gather_loans/restrictions.rs

@@ -70,19 +70,18 @@ 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(mc::CopiedUpvar { upvar_id, .. }) => {
-                // R-Variable, copied/moved into closure
-                let lp = Rc::new(LpVar(upvar_id));
-                SafeIf(lp.clone(), vec![lp])
+            mc::cat_copied_upvar(..) => {
+                // FIXME(#2152) allow mutation of upvars
+                Safe
             }
 
             mc::cat_downcast(cmt_base) => {

branches/snap-stage3/src/librustrt/unwind.rs

@@ -402,11 +402,8 @@ pub mod eabi {
     use libunwind as uw;
     use libc::{c_void, c_int};
 
-    #[repr(C)]
     struct EXCEPTION_RECORD;
-    #[repr(C)]
     struct CONTEXT;
-    #[repr(C)]
     struct DISPATCHER_CONTEXT;
 
     #[repr(C)]

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

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

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

@@ -12,8 +12,4 @@ 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
 }