about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTim Chevalier <chevalier@alum.wellesley.edu>2011-08-30 17:19:13 -0700
committerTim Chevalier <chevalier@alum.wellesley.edu>2011-08-30 17:19:13 -0700
commit6d8bb3ce29aa22297a0bdcb9b2ef41fc60bf098e (patch)
tree11ea46a79e395c8b8d91ac6623db09aa43a16fd8
parent9f7ed2f054c72dd0989b42ed3e6a839e64d9fa1a (diff)
downloadrust-6d8bb3ce29aa22297a0bdcb9b2ef41fc60bf098e.tar.gz
rust-6d8bb3ce29aa22297a0bdcb9b2ef41fc60bf098e.zip
Un-xfail zip-same-length
There was a type error that was getting reported poorly. Fixed it.
(Now to figure out why the error was reported so poorly...)
-rw-r--r--src/test/run-pass/zip-same-length.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/test/run-pass/zip-same-length.rs b/src/test/run-pass/zip-same-length.rs
index 1a9dafd6575..5427f548d35 100644
--- a/src/test/run-pass/zip-same-length.rs
+++ b/src/test/run-pass/zip-same-length.rs
@@ -1,6 +1,3 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
 // In this case, the code should compile and should
 // succeed at runtime
 use std;
@@ -20,6 +17,7 @@ fn main() {
     check same_length(chars, ints);
     let ps = zip(chars, ints);
 
+    check is_not_empty(ps);
     assert (head(ps) == ('a', 1u));
-    assert (last(ps) == ('j' as u8, 10u));
-}
\ No newline at end of file
+    assert (last_total(ps) == (j as char, 10u));
+}