Revert "Use different syntax for checks that matter to typestate"

This reverts commit aa25f22f197682de3b18fc4c8ba068d1feda220f. It broke stage2, not sure why yet.

1 files changed, 16 insertions, 16 deletions

diff --git a/src/test/run-pass/utf8_chars.rs b/src/test/run-pass/utf8_chars.rs
index 07eaca19..08671093 100644
--- a/src/test/run-pass/utf8_chars.rs
+++ b/src/test/run-pass/utf8_chars.rs
@@ -9,25 +9,25 @@ fn main() {
   let vec[char] chs = vec('e', 'é', '€', 0x10000 as char);
   let str s = _str.from_chars(chs);
 
-  assert (_str.byte_len(s) == 10u);
-  assert (_str.char_len(s) == 4u);
-  assert (_vec.len[char](_str.to_chars(s)) == 4u);
-  assert (_str.eq(_str.from_chars(_str.to_chars(s)), s));
-  assert (_str.char_at(s, 0u) == 'e');
-  assert (_str.char_at(s, 1u) == 'é');
+  check(_str.byte_len(s) == 10u);
+  check(_str.char_len(s) == 4u);
+  check(_vec.len[char](_str.to_chars(s)) == 4u);
+  check(_str.eq(_str.from_chars(_str.to_chars(s)), s));
+  check(_str.char_at(s, 0u) == 'e');
+  check(_str.char_at(s, 1u) == 'é');
 
-  assert (_str.is_utf8(_str.bytes(s)));
-  assert (!_str.is_utf8(vec(0x80_u8)));
-  assert (!_str.is_utf8(vec(0xc0_u8)));
-  assert (!_str.is_utf8(vec(0xc0_u8, 0x10_u8)));
+  check(_str.is_utf8(_str.bytes(s)));
+  check(!_str.is_utf8(vec(0x80_u8)));
+  check(!_str.is_utf8(vec(0xc0_u8)));
+  check(!_str.is_utf8(vec(0xc0_u8, 0x10_u8)));
 
   auto stack = "a×c€";
-  assert (_str.pop_char(stack) == '€');
-  assert (_str.pop_char(stack) == 'c');
+  check(_str.pop_char(stack) == '€');
+  check(_str.pop_char(stack) == 'c');
   _str.push_char(stack, 'u');
-  assert (_str.eq(stack, "a×u"));
-  assert (_str.shift_char(stack) == 'a');
-  assert (_str.shift_char(stack) == '×');
+  check(_str.eq(stack, "a×u"));
+  check(_str.shift_char(stack) == 'a');
+  check(_str.shift_char(stack) == '×');
   _str.unshift_char(stack, 'ß');
-  assert (_str.eq(stack, "ßu"));
+  check(_str.eq(stack, "ßu"));
 }