about summary refs log tree commit diff
path: root/src/libsyntax/util/interner.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-04-15 20:00:56 -0700
committerbors <bors@rust-lang.org>2013-04-15 20:00:56 -0700
commit16e8af9e477fd5a6e7dcf668840144a97e3b1410 (patch)
tree0aadb938c2b293f149e4501fb26b5da5e6a818c1 /src/libsyntax/util/interner.rs
parent447caf9bdb8b769581fcd8c337634da431d21954 (diff)
parent40e3577b0834794b2d44e6c527fda90d1adbc88e (diff)
downloadrust-16e8af9e477fd5a6e7dcf668840144a97e3b1410.tar.gz
rust-16e8af9e477fd5a6e7dcf668840144a97e3b1410.zip
auto merge of #5895 : huonw/rust/no-pub-tests, r=thestinger
This patch is a sledge hammer that moves all tests into `#[cfg(test)] mod test { .. }`, and makes them private, there were several instances of `pub mod tests { #[test] pub fn ... } `.

(The reason for this is I was playing with using `syntax` to index code ([result so far](http://www.ug.it.usyd.edu.au/~hwil7821/rust-api/)) and it was getting some junk from the tests.)

The rustdoc commit is particularly brutal, so it's fine if that one isn't landed.
Diffstat (limited to 'src/libsyntax/util/interner.rs')
-rw-r--r--src/libsyntax/util/interner.rs80
1 files changed, 42 insertions, 38 deletions
diff --git a/src/libsyntax/util/interner.rs b/src/libsyntax/util/interner.rs
index 4108871d008..1133fd850d8 100644
--- a/src/libsyntax/util/interner.rs
+++ b/src/libsyntax/util/interner.rs
@@ -66,43 +66,47 @@ pub impl<T:Eq + IterBytes + Hash + Const + Copy> Interner<T> {
     fn len(&self) -> uint { let vect = &*self.vect; vect.len() }
 }
 
-#[test]
-#[should_fail]
-pub fn i1 () {
-    let i : Interner<@~str> = Interner::new();
-    i.get(13);
-}
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    #[should_fail]
+    fn i1 () {
+        let i : Interner<@~str> = Interner::new();
+        i.get(13);
+    }
 
-#[test]
-pub fn i2 () {
-    let i : Interner<@~str> = Interner::new();
-    // first one is zero:
-    assert_eq!(i.intern (@~"dog"), 0);
-    // re-use gets the same entry:
-    assert_eq!(i.intern (@~"dog"), 0);
-    // different string gets a different #:
-    assert_eq!(i.intern (@~"cat"), 1);
-    assert_eq!(i.intern (@~"cat"), 1);
-    // dog is still at zero
-    assert_eq!(i.intern (@~"dog"), 0);
-    // gensym gets 3
-    assert_eq!(i.gensym (@~"zebra" ), 2);
-    // gensym of same string gets new number :
-    assert_eq!(i.gensym (@~"zebra" ), 3);
-    // gensym of *existing* string gets new number:
-    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]
+    fn i2 () {
+        let i : Interner<@~str> = Interner::new();
+        // first one is zero:
+        assert_eq!(i.intern (@~"dog"), 0);
+        // re-use gets the same entry:
+        assert_eq!(i.intern (@~"dog"), 0);
+        // different string gets a different #:
+        assert_eq!(i.intern (@~"cat"), 1);
+        assert_eq!(i.intern (@~"cat"), 1);
+        // dog is still at zero
+        assert_eq!(i.intern (@~"dog"), 0);
+        // gensym gets 3
+        assert_eq!(i.gensym (@~"zebra" ), 2);
+        // gensym of same string gets new number :
+        assert_eq!(i.gensym (@~"zebra" ), 3);
+        // gensym of *existing* string gets new number:
+        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"]);
-    assert_eq!(i.get(0), @~"Alan");
-    assert_eq!(i.get(1), @~"Bob");
-    assert_eq!(i.get(2), @~"Carol");
-    assert_eq!(i.intern(@~"Bob"), 1);
-}
+    #[test]
+    fn i3 () {
+        let i : Interner<@~str> = Interner::prefill([@~"Alan",@~"Bob",@~"Carol"]);
+        assert_eq!(i.get(0), @~"Alan");
+        assert_eq!(i.get(1), @~"Bob");
+        assert_eq!(i.get(2), @~"Carol");
+        assert_eq!(i.intern(@~"Bob"), 1);
+    }
+}
\ No newline at end of file