---

yaml
---
r: 149544
b: refs/heads/try2
c: 7d85546
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 35f2da4063bbf2e6e945fdce547b6855ef061b15
+refs/heads/try2: 7d85546721cf954606a2fe25a63e9fb9e8a256ad
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/test/run-make/unicode-input/multiple_files.rs

@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::{char, os, run, str};
+use std::{char, os, str};
 use std::rand::{task_rng, Rng};
-use std::io::File;
+use std::io::{File, Process};
 
 // creates unicode_input_multiple_files_{main,chars}.rs, where the
 // former imports the latter. `_chars` just contains an indentifier
@@ -55,7 +55,7 @@ fn main() {
 
         // rustc is passed to us with --out-dir and -L etc., so we
         // can't exec it directly
-        let result = run::process_output("sh", [~"-c", rustc + " " + main_file_str]).unwrap();
+        let result = Process::output("sh", [~"-c", rustc + " " + main_file_str]).unwrap();
         let err = str::from_utf8_lossy(result.error);
 
         // positive test so that this test will be updated when the

branches/try2/src/test/run-make/unicode-input/span_length.rs

@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::{char, os, run, str};
+use std::{char, os, str};
 use std::rand::{task_rng, Rng};
-use std::io::File;
+use std::io::{File, Process};
 
 // creates a file with `fn main() { <random ident> }` and checks the
 // compiler emits a span of the appropriate length (for the
@@ -51,7 +51,7 @@ fn main() {
 
         // rustc is passed to us with --out-dir and -L etc., so we
         // can't exec it directly
-        let result = run::process_output("sh", [~"-c", rustc + " " + main_file_str]).unwrap();
+        let result = Process::output("sh", [~"-c", rustc + " " + main_file_str]).unwrap();
 
         let err = str::from_utf8_lossy(result.error);