From 51d98d9c7bcdfad2daec697739b25193adc09ced Mon Sep 17 00:00:00 2001
From: Tim Chevalier <chevalier@alum.wellesley.edu>
Date: Wed, 15 Aug 2012 11:55:17 -0700
Subject: Expunge match checks

---
 src/libcore/comm.rs |  5 +++--
 src/libcore/run.rs  |  6 +++++-
 src/libcore/str.rs  | 10 ++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'src/libcore')

diff --git a/src/libcore/comm.rs b/src/libcore/comm.rs
index 38bdc407547..b4cf0ef1002 100644
--- a/src/libcore/comm.rs
+++ b/src/libcore/comm.rs
@@ -412,9 +412,10 @@ fn test_select2_stress() {
     let mut as = 0;
     let mut bs = 0;
     for iter::repeat(msgs * times * 2u) {
-        match check select2(po_a, po_b) {
+        match select2(po_a, po_b) {
           either::left(~"a") => as += 1,
-          either::right(~"b") => bs += 1
+          either::right(~"b") => bs += 1,
+          _ => fail ~"test_select_2_stress failed"
         }
     }
 
diff --git a/src/libcore/run.rs b/src/libcore/run.rs
index f754391a50d..7b08bb8f96b 100644
--- a/src/libcore/run.rs
+++ b/src/libcore/run.rs
@@ -312,13 +312,17 @@ fn program_output(prog: &str, args: &[~str]) ->
     let mut count = 2;
     while count > 0 {
         let stream = comm::recv(p);
-        match check stream {
+        match stream {
             (1, s) => {
                 outs = s;
             }
             (2, s) => {
                 errs = s;
             }
+            (n, _) => {
+                fail(#fmt("program_output received an unexpected file \
+                  number: %u", n));
+            }
         };
         count -= 1;
     };
diff --git a/src/libcore/str.rs b/src/libcore/str.rs
index 181c36932d0..9a1e32a6711 100644
--- a/src/libcore/str.rs
+++ b/src/libcore/str.rs
@@ -2771,10 +2771,11 @@ mod tests {
     fn test_chars_iter() {
         let mut i = 0;
         do chars_iter(~"x\u03c0y") |ch| {
-            match check i {
+            match i {
               0 => assert ch == 'x',
               1 => assert ch == '\u03c0',
-              2 => assert ch == 'y'
+              2 => assert ch == 'y',
+              _ => fail ~"test_chars_iter failed"
             }
             i += 1;
         }
@@ -2787,10 +2788,11 @@ mod tests {
         let mut i = 0;
 
         do bytes_iter(~"xyz") |bb| {
-            match check i {
+            match i {
               0 => assert bb == 'x' as u8,
               1 => assert bb == 'y' as u8,
-              2 => assert bb == 'z' as u8
+              2 => assert bb == 'z' as u8,
+              _ => fail ~"test_bytes_iter failed"
             }
             i += 1;
         }
-- 
cgit 1.4.1-3-g733a5