---

yaml
---
r: 156631
b: refs/heads/try
c: 96445a5
h: refs/heads/master
i:
  156629: a82f10a
  156627: 6ccd72b
  156623: 4c2d406
v: v3

Author: alexcrichton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: a34b8dec697014f15e725215e17ea8d956c0ab1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: d44ea720fa9dfe062ef06d0eb49a58d4e7e92344
-refs/heads/try: 9d5d97b55d6487ee23b805bc1acbaa0669b82116
+refs/heads/try: 96445a533e8ea40701e2a9bbd25347141e63c115
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 6601b0501e31d08d3892a2d5a7d8a57ab120bf75

branches/try/src/libnative/io/process.rs

@@ -489,15 +489,15 @@ fn make_command_line(prog: &CString, args: &[CString]) -> String {
         }
         let argvec: Vec<char> = arg.chars().collect();
         for i in range(0u, argvec.len()) {
-            append_char_at(cmd, &argvec, i);
+            append_char_at(cmd, argvec.as_slice(), i);
         }
         if quote {
             cmd.push('"');
         }
     }
 
-    fn append_char_at(cmd: &mut String, arg: &Vec<char>, i: uint) {
-        match *arg.get(i) {
+    fn append_char_at(cmd: &mut String, arg: &[char], i: uint) {
+        match arg[i] {
             '"' => {
                 // Escape quotes.
                 cmd.push_str("\\\"");
@@ -517,11 +517,11 @@ fn make_command_line(prog: &CString, args: &[CString]) -> String {
         }
     }
 
-    fn backslash_run_ends_in_quote(s: &Vec<char>, mut i: uint) -> bool {
-        while i < s.len() && *s.get(i) == '\\' {
+    fn backslash_run_ends_in_quote(s: &[char], mut i: uint) -> bool {
+        while i < s.len() && s[i] == '\\' {
             i += 1;
         }
-        return i < s.len() && *s.get(i) == '"';
+        return i < s.len() && s[i] == '"';
     }
 }
 

branches/try/src/libnative/task.rs

@@ -345,7 +345,7 @@ mod tests {
     #[test]
     fn spawn_inherits() {
         let (tx, rx) = channel();
-        spawn(proc() {
+        TaskBuilder::new().spawner(NativeSpawner).spawn(proc() {
             spawn(proc() {
                 let mut task: Box<Task> = Local::take();
                 match task.maybe_take_runtime::<Ops>() {

branches/try/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
 }

branches/try/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;