Test fixes and rebase conflicts

src/test/compile-fail/writing-to-immutable-vec.rs

@@ -11,5 +11,5 @@
 
 fn main() {
     let v: Vec<int> = vec!(1, 2, 3);
-    v[1] = 4; //~ ERROR cannot assign
+    v[1] = 4; //~ ERROR cannot borrow immutable local variable `v` as mutable
 }

src/test/run-pass/vector-sort-failure-safe.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use std::task;
-use std::sync::atomics::{AtomicUint, INIT_ATOMIC_UINT, Relaxed};
+use std::sync::atomic::{AtomicUint, INIT_ATOMIC_UINT, Relaxed};
 use std::rand::{task_rng, Rng, Rand};
 
 const REPEATS: uint = 5;