Test fixes and rebase conflicts

diff --git a/mk/tests.mk b/mk/tests.mk
index 3d66ce86d7b098da4e2942d7af6bacade12ac4f9..1a122572e434c4c7a05f3c906209735fcbdab964 100644 (file)
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -285,7 +285,7 @@ tidy:
                | xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
                $(Q)echo $(ALL_HS) \
                | xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
-               $(Q)find $(S)src -type f -perm /a+x \
+               $(Q)find $(S)src -type f -perm +a+x \
                    -not -name '*.rs' -and -not -name '*.py' \
                    -and -not -name '*.sh' \
                | grep '^$(S)src/jemalloc' -v \

diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs
index 271cab393c4407a33c6d37198bbc7b599b807b6d..893c9d250b7237cae7fa3aff45f0de81f3ce985e 100644 (file)
--- a/src/liballoc/arc.rs
+++ b/src/liballoc/arc.rs
@@ -33,36 +33,37 @@
 //!
 //! ```
 //! use std::sync::Arc;
+//! use std::thread::Thread;
 //!
 //! let five = Arc::new(5i);
 //!
 //! for i in range(0u, 10) {
 //!     let five = five.clone();
 //!
-//!     spawn(move || {
+//!     Thread::spawn(move || {
 //!         println!("{}", five);
-//!     });
+//!     }).detach();
 //! }
 //! ```
 //!
 //! Sharing mutable data safely between tasks with a `Mutex`:
 //!
 //! ```
-//! use std::sync::Arc;
-//! use std::sync::Mutex;
+//! use std::sync::{Arc, Mutex};
+//! use std::thread::Thread;
 //!
 //! let five = Arc::new(Mutex::new(5i));
 //!
 //! for _ in range(0u, 10) {
 //!     let five = five.clone();
 //!
-//!     spawn(move || {
+//!     Thread::spawn(move || {
 //!         let mut number = five.lock();
 //!
-//!         number += 1;
+//!         *number += 1;
 //!
 //!         println!("{}", *number); // prints 6
-//!     });
+//!     }).detach();
 //! }
 //! ```
 

diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs
index ec2a7c7a06ca776154dad482820719ab71be0baf..b82c7e4cba27b5ed0c44804637989b93933f0ef8 100644 (file)
--- a/src/libcollections/vec.rs
+++ b/src/libcollections/vec.rs
@@ -53,6 +53,7 @@
 use core::default::Default;
 use core::fmt;
 use core::hash::{mod, Hash};
+use core::iter::repeat;
 use core::kinds::marker::{ContravariantLifetime, InvariantType};
 use core::mem;
 use core::num::{Int, UnsignedInt};

diff --git a/src/librustc/middle/stability.rs b/src/librustc/middle/stability.rs
index 9d032df67dc8bcd461a81afe726c291c0f03cfeb..d793f49efe5e8cf640d608d99cdf4261015816d3 100644 (file)
--- a/src/librustc/middle/stability.rs
+++ b/src/librustc/middle/stability.rs
@@ -131,7 +131,7 @@ fn visit_struct_field(&mut self, s: &StructField) {
     }
 
     fn visit_foreign_item(&mut self, i: &ast::ForeignItem) {
-        self.annotate(i.id, &i.attrs, |_| {});
+        self.annotate(i.id, true, &i.attrs, |_| {});
     }
 }
 

diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs
index 34d89162249fa21b4bb848446bc61b64bc35c20f..85a06125e23ab6665cbaca06229437e0005f092c 100644 (file)
--- a/src/librustc/util/ppaux.rs
+++ b/src/librustc/util/ppaux.rs
@@ -535,6 +535,8 @@ pub fn parameterized<'tcx>(cx: &ctxt<'tcx>,
                 base,
                 if strs[0].starts_with("(") && strs[0].ends_with(",)") {
                     strs[0][1 .. strs[0].len() - 2] // Remove '(' and ',)'
+                } else if strs[0].starts_with("(") && strs[0].ends_with(")") {
+                    strs[0][1 .. strs[0].len() - 1] // Remove '(' and ')'
                 } else {
                     strs[0][]
                 },

diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs
index c32fec67d66731f74a1eab99966c229664e6dcb5..8149864afd405e4ac79783805b48aa231f55350e 100644 (file)
--- a/src/libstd/collections/hash/map.rs
+++ b/src/libstd/collections/hash/map.rs
@@ -1473,7 +1473,6 @@ mod test_map {
 
     use super::HashMap;
     use super::Entry::{Occupied, Vacant};
-    use cmp::Equiv;
     use hash;
     use iter::{range_inclusive, range_step_inclusive};
     use cell::RefCell;

diff --git a/src/snapshots.txt b/src/snapshots.txt
index 653097e8993edf3e8cddb7239e68dc561304cccc..c3cdf4acba15080d24f77fb04c6c943b7cfa6282 100644 (file)
--- a/src/snapshots.txt
+++ b/src/snapshots.txt
@@ -3,7 +3,7 @@ S 2014-12-20 8443b09
   linux-i386 3daf531aed03f5769402f2fef852377e2838db98
   linux-x86_64 4f3c8b092dd4fe159d6f25a217cf62e0e899b365
   macos-i386 2a3e647b9c400505bd49cfe56091e866c83574ca
-  macos-x86_64 78f952a3e77a9921a23c957bb133131017b57324
+  macos-x86_64 5e730efc34d79a33f464a87686c10eace0760a2e
   winnt-i386 8ea056043de82096d5ce5abc98c8c74ebac7e77d
   winnt-x86_64 9804100dafae9b64a76e0ea7e1be157719dae151
 

diff --git a/src/test/compile-fail/issue-13359.rs b/src/test/compile-fail/issue-13359.rs
index 227ed3fb83420d059057916a3ff82d7f0c77be38..5c72c7388a9ee2d34f187885a87f97f8149fe462 100644 (file)
--- a/src/test/compile-fail/issue-13359.rs
+++ b/src/test/compile-fail/issue-13359.rs
@@ -14,8 +14,8 @@ fn bar(_s: u32) { }
 
 fn main() {
     foo(1*(1 as int));
-    //~^ ERROR: mismatched types: expected `i16`, found `int` (expected `i16`, found `int`)
+    //~^ ERROR: mismatched types: expected `i16`, found `int` (expected i16, found int)
 
     bar(1*(1 as uint));
-    //~^ ERROR: mismatched types: expected `u32`, found `uint` (expected `u32`, found `uint`)
+    //~^ ERROR: mismatched types: expected `u32`, found `uint` (expected u32, found uint)
 }

diff --git a/src/test/run-pass/issue-20091.rs b/src/test/run-pass/issue-20091.rs
index daf898faef76aa528a411308295548d995be835b..d653843ba059044b5bc10f09b2d702cef2e6cc48 100644 (file)
--- a/src/test/run-pass/issue-20091.rs
+++ b/src/test/run-pass/issue-20091.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-windows currently windows requires UTF-8 for spawning processes
+
 use std::io::Command;
 use std::os;