---

yaml
---
r: 149911
b: refs/heads/try2
c: e86e1d8
h: refs/heads/master
i:
  149909: 7d0ff88
  149907: 1b879dc
  149903: 005db9d
v: v3

Author: bors

[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: 62026fd6b64296c85a8150119e2cd6a162b8b5e0
+refs/heads/try2: e86e1d88b2842671123d0a072d00c94bd3f39264
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/compiletest/compiletest.rs

@@ -191,13 +191,13 @@ pub fn opt_str2(maybestr: Option<~str>) -> ~str {
 }
 
 pub fn str_mode(s: ~str) -> mode {
-    match s {
-      ~"compile-fail" => mode_compile_fail,
-      ~"run-fail" => mode_run_fail,
-      ~"run-pass" => mode_run_pass,
-      ~"pretty" => mode_pretty,
-      ~"debug-info" => mode_debug_info,
-      ~"codegen" => mode_codegen,
+    match s.as_slice() {
+      "compile-fail" => mode_compile_fail,
+      "run-fail" => mode_run_fail,
+      "run-pass" => mode_run_pass,
+      "pretty" => mode_pretty,
+      "debug-info" => mode_debug_info,
+      "codegen" => mode_codegen,
       _ => fail!("invalid mode")
     }
 }

branches/try2/src/compiletest/runtest.rs

@@ -38,9 +38,9 @@ use test::MetricMap;
 
 pub fn run(config: config, testfile: ~str) {
 
-    match config.target {
+    match config.target.as_slice() {
 
-        ~"arm-linux-androideabi" => {
+        "arm-linux-androideabi" => {
             if !config.adb_device_status {
                 fail!("android device not available");
             }
@@ -277,8 +277,8 @@ fn run_debuginfo_test(config: &config, props: &TestProps, testfile: &Path) {
     let exe_file = make_exe_name(config, testfile);
 
     let mut proc_args;
-    match config.target {
-        ~"arm-linux-androideabi" => {
+    match config.target.as_slice() {
+        "arm-linux-androideabi" => {
 
             cmds = cmds.replace("run","continue");
 
@@ -682,9 +682,9 @@ fn exec_compiled_test(config: &config, props: &TestProps,
 
     let env = props.exec_env.clone();
 
-    match config.target {
+    match config.target.as_slice() {
 
-        ~"arm-linux-androideabi" => {
+        "arm-linux-androideabi" => {
             _arm_exec_compiled_test(config, props, testfile, env)
         }
 
@@ -735,9 +735,9 @@ fn compose_and_run_compiler(
                 &auxres);
         }
 
-        match config.target {
+        match config.target.as_slice() {
 
-            ~"arm-linux-androideabi" => {
+            "arm-linux-androideabi" => {
                 _arm_push_aux_shared_library(config, testfile);
             }