change some uses of fail_unless to assert_eq

2 files changed, 17 insertions, 41 deletions

diff --git a/src/libsyntax/util/interner.rs b/src/libsyntax/util/interner.rs
index 47f49ebadaa..b4a85ce1617 100644
--- a/src/libsyntax/util/interner.rs
+++ b/src/libsyntax/util/interner.rs
@@ -77,32 +77,32 @@ pub fn i1 () {
 pub fn i2 () {
     let i : Interner<@~str> = Interner::new();
     // first one is zero:
-    fail_unless!(i.intern (@~"dog") == 0);
+    assert_eq!(i.intern (@~"dog"), 0);
     // re-use gets the same entry:
-    fail_unless!(i.intern (@~"dog") == 0);
+    assert_eq!(i.intern (@~"dog"), 0);
     // different string gets a different #:
-    fail_unless!(i.intern (@~"cat") == 1);
-    fail_unless!(i.intern (@~"cat") == 1);
+    assert_eq!(i.intern (@~"cat"), 1);
+    assert_eq!(i.intern (@~"cat"), 1);
     // dog is still at zero
-    fail_unless!(i.intern (@~"dog") == 0);
+    assert_eq!(i.intern (@~"dog"), 0);
     // gensym gets 3
-    fail_unless!(i.gensym (@~"zebra" ) == 2);
+    assert_eq!(i.gensym (@~"zebra" ), 2);
     // gensym of same string gets new number :
-    fail_unless!(i.gensym (@~"zebra" ) == 3);
+    assert_eq!(i.gensym (@~"zebra" ), 3);
     // gensym of *existing* string gets new number:
-    fail_unless!(i.gensym (@~"dog") == 4);
-    fail_unless!(i.get(0) == @~"dog");
-    fail_unless!(i.get(1) == @~"cat");
-    fail_unless!(i.get(2) == @~"zebra");
-    fail_unless!(i.get(3) == @~"zebra");
-    fail_unless!(i.get(4) == @~"dog");
+    assert_eq!(i.gensym (@~"dog"), 4);
+    assert_eq!(i.get(0), @~"dog");
+    assert_eq!(i.get(1), @~"cat");
+    assert_eq!(i.get(2), @~"zebra");
+    assert_eq!(i.get(3), @~"zebra");
+    assert_eq!(i.get(4), @~"dog");
 }
 
 #[test]
 pub fn i3 () {
     let i : Interner<@~str> = Interner::prefill([@~"Alan",@~"Bob",@~"Carol"]);
-    fail_unless!(i.get(0) == @~"Alan");
-    fail_unless!(i.get(1) == @~"Bob");
-    fail_unless!(i.get(2) == @~"Carol");
-    fail_unless!(i.intern(@~"Bob") == 1);
+    assert_eq!(i.get(0), @~"Alan");
+    assert_eq!(i.get(1), @~"Bob");
+    assert_eq!(i.get(2), @~"Carol");
+    assert_eq!(i.intern(@~"Bob"), 1);
 }
diff --git a/src/libsyntax/util/testing.rs b/src/libsyntax/util/testing.rs
deleted file mode 100644
index 78a175df29f..00000000000
--- a/src/libsyntax/util/testing.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// support for test cases.
-use core::cmp;
-
-pub pure fn check_equal_ptr<T:cmp::Eq> (given : &T, expected: &T) {
-    if !((given == expected) && (expected == given )) {
-        fail!(fmt!("given %?, expected %?",given,expected));
-    }
-}
-
-pub pure fn check_equal<T:cmp::Eq> (given : T, expected: T) {
-    if !((given == expected) && (expected == given )) {
-        fail!(fmt!("given %?, expected %?",given,expected));
-    }
-}