---

yaml
---
r: 129493
b: refs/heads/snap-stage3
c: 8c994a1
h: refs/heads/master
i:
  129491: fa28994
v: v3

Author: vadimcn

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 566b470e138e929e8a93d613372db1ba177c494f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: f66fd2eed10de2acacd8af73c704bf4d140410bb
+refs/heads/snap-stage3: 8c994a1237d1c79811920cf852d0b801b8518336
 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/compiletest/runtest.rs

@@ -17,7 +17,6 @@ use header;
 use procsrv;
 use util::logv;
 #[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 use util;
 
 use std::io::File;
@@ -819,7 +818,6 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
     }).collect::<Vec<String> >();
 
     #[cfg(target_os = "windows")]
-    #[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
     fn to_lower( s : &str ) -> String {
         let i = s.chars();
         let c : Vec<char> = i.map( |c| {
@@ -833,7 +831,6 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
     }
 
     #[cfg(target_os = "windows")]
-    #[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
     fn prefix_matches( line : &str, prefix : &str ) -> bool {
         to_lower(line).as_slice().starts_with(to_lower(prefix).as_slice())
     }
@@ -1251,15 +1248,13 @@ fn make_cmdline(_libpath: &str, prog: &str, args: &[String]) -> String {
 }
 
 #[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 fn make_cmdline(libpath: &str, prog: &str, args: &[String]) -> String {
     format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" "))
 }
 
 // Build the LD_LIBRARY_PATH variable as it would be seen on the command line
 // for diagnostic purposes
 #[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 fn lib_path_cmd_prefix(path: &str) -> String {
     format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path))
 }

branches/snap-stage3/src/compiletest/util.rs

@@ -11,7 +11,6 @@
 use common::Config;
 
 #[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 use std::os::getenv;
 
 /// Conversion table from triple OS name to Rust SYSNAME
@@ -36,7 +35,6 @@ pub fn get_os(triple: &str) -> &'static str {
 }
 
 #[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 pub fn make_new_path(path: &str) -> String {
 
     // Windows just uses PATH as the library search path, so we have to
@@ -50,11 +48,9 @@ pub fn make_new_path(path: &str) -> String {
 }
 
 #[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 pub fn lib_path_env_var() -> &'static str { "PATH" }
 
 #[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 pub fn path_div() -> &'static str { ";" }
 
 pub fn logv(config: &Config, s: String) {

branches/snap-stage3/src/etc/mklldeps.py

@@ -68,8 +68,6 @@ def run(args):
     ]
 
     f.write("#[cfg(" + ', '.join(cfg) + ")]\n")
-    if os == "windows": # NOTE: Remove after snapshot
-        f.write("#[cfg(stage0, target_arch = \"%s\", target_os = \"win32\")]\n" % (arch,))
 
     version = run([llconfig, '--version']).strip()
 

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,16 +1357,8 @@ 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/librustdoc/plugins.rs

@@ -74,7 +74,6 @@ impl PluginManager {
 }
 
 #[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 fn libname(mut n: String) -> String {
     n.push_str(".dll");
     n
@@ -86,8 +85,7 @@ fn libname(mut n: String) -> String {
     n
 }
 
-#[cfg(not(stage0), not(target_os="windows"), not(target_os="macos"))]
-#[cfg(stage0, not(target_os="win32"), not(target_os="macos"))] // NOTE: Remove after snapshot
+#[cfg(not(target_os="windows"), not(target_os="macos"))]
 fn libname(n: String) -> String {
     let mut i = String::from_str("lib");
     i.push_str(n.as_slice());

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

@@ -148,7 +148,6 @@ mod imp {
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "ios")]
 #[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 mod imp {
     use core::prelude::*;
     use collections::vec::Vec;

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

@@ -88,7 +88,6 @@ pub type _Unwind_Exception_Cleanup_Fn =
 #[cfg(target_os = "linux")]
 #[cfg(target_os = "freebsd")]
 #[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 #[link(name = "gcc_s")]
 extern {}
 

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

@@ -200,7 +200,6 @@ pub unsafe fn record_sp_limit(limit: uint) {
         asm!("movq $0, %fs:112" :: "r"(limit) :: "volatile")
     }
     #[cfg(target_arch = "x86_64", target_os = "windows")] #[inline(always)]
-    #[cfg(stage0, target_arch = "x86_64", target_os = "win32")] // NOTE: Remove after snapshot
     unsafe fn target_record_sp_limit(limit: uint) {
         // see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block
         // store this inside of the "arbitrary data slot", but double the size
@@ -229,7 +228,6 @@ pub unsafe fn record_sp_limit(limit: uint) {
         asm!("movl $0, %gs:48" :: "r"(limit) :: "volatile")
     }
     #[cfg(target_arch = "x86", target_os = "windows")] #[inline(always)]
-    #[cfg(stage0, target_arch = "x86", target_os = "win32")] // NOTE: Remove after snapshot
     unsafe fn target_record_sp_limit(limit: uint) {
         // see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block
         // store this inside of the "arbitrary data slot"
@@ -283,7 +281,6 @@ pub unsafe fn get_sp_limit() -> uint {
         return limit;
     }
     #[cfg(target_arch = "x86_64", target_os = "windows")] #[inline(always)]
-    #[cfg(stage0, target_arch = "x86_64", target_os = "win32")] // NOTE: Remove after snapshot
     unsafe fn target_get_sp_limit() -> uint {
         let limit;
         asm!("movq %gs:0x28, $0" : "=r"(limit) ::: "volatile");
@@ -320,7 +317,6 @@ pub unsafe fn get_sp_limit() -> uint {
         return limit;
     }
     #[cfg(target_arch = "x86", target_os = "windows")] #[inline(always)]
-    #[cfg(stage0, target_arch = "x86", target_os = "win32")] // NOTE: Remove after snapshot
     unsafe fn target_get_sp_limit() -> uint {
         let limit;
         asm!("movl %fs:0x14, $0" : "=r"(limit) ::: "volatile");

branches/snap-stage3/src/librustuv/uvll.rs

@@ -733,7 +733,6 @@ extern {}
 extern {}
 
 #[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 #[link(name = "ws2_32")]
 #[link(name = "psapi")]
 #[link(name = "iphlpapi")]

branches/snap-stage3/src/libstd/dynamic_lib.rs

@@ -279,7 +279,6 @@ pub mod dl {
 }
 
 #[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 pub mod dl {
     use c_str::ToCStr;
     use iter::Iterator;

branches/snap-stage3/src/libstd/os.rs

@@ -1843,7 +1843,6 @@ pub mod consts {
 }
 
 #[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 pub mod consts {
     pub use os::arch_consts::ARCH;
 

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
 }

branches/snap-stage3/src/test/run-pass/dupe-first-attr.rc

@@ -18,7 +18,6 @@ mod hello;
 mod hello;
 
 #[cfg(target_os = "windows")]
-/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
 mod hello;
 
 #[cfg(target_os = "freebsd")]

branches/snap-stage3/src/test/run-pass/intrinsic-alignment.rs

@@ -43,7 +43,6 @@ mod m {
 }
 
 #[cfg(target_os = "windows")]
-/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
 mod m {
     #[main]
     #[cfg(target_arch = "x86")]

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

@@ -56,7 +56,6 @@ mod m {
 }
 
 #[cfg(target_os = "windows")]
-/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
 mod m {
     #[cfg(target_arch = "x86")]
     pub mod m {