---

yaml
---
r: 73223
b: refs/heads/dist-snap
c: 7103c39
h: refs/heads/master
i:
  73221: 5bca289
  73219: 4d88a2b
  73215: 9e7beb4
v: v3

Author: brendanzab

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
-refs/heads/dist-snap: d9eec664fd812dda88c349d092f327c9be8a7558
+refs/heads/dist-snap: 7103c39dbb32f5bc1452f8abaa3de5d68b47053b
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libcore/tuple.rs

@@ -311,55 +311,61 @@ tuple_impls!(
     }
 )
 
-#[test]
-fn test_tuple_ref() {
-    let x = (~"foo", ~"bar");
-    assert_eq!(x.first_ref(), &~"foo");
-    assert_eq!(x.second_ref(), &~"bar");
-}
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use clone::Clone;
+
+    #[test]
+    fn test_tuple_ref() {
+        let x = (~"foo", ~"bar");
+        assert_eq!(x.first_ref(), &~"foo");
+        assert_eq!(x.second_ref(), &~"bar");
+    }
 
-#[test]
-#[allow(non_implicitly_copyable_typarams)]
-fn test_tuple() {
-    assert_eq!((948, 4039.48).first(), 948);
-    assert_eq!((34.5, ~"foo").second(), ~"foo");
-    assert_eq!(('a', 2).swap(), (2, 'a'));
-}
+    #[test]
+    #[allow(non_implicitly_copyable_typarams)]
+    fn test_tuple() {
+        assert_eq!((948, 4039.48).first(), 948);
+        assert_eq!((34.5, ~"foo").second(), ~"foo");
+        assert_eq!(('a', 2).swap(), (2, 'a'));
+    }
 
-#[test]
-fn test_clone() {
-    let a = (1, ~"2");
-    let b = a.clone();
-    assert_eq!(a.first(), b.first());
-    assert_eq!(a.second(), b.second());
-}
+    #[test]
+    fn test_clone() {
+        let a = (1, ~"2");
+        let b = a.clone();
+        assert_eq!(a.first(), b.first());
+        assert_eq!(a.second(), b.second());
+    }
 
-#[test]
-fn test_n_tuple() {
-    let t = (0u8, 1u16, 2u32, 3u64, 4u, 5i8, 6i16, 7i32, 8i64, 9i, 10f32, 11f64);
-    assert_eq!(t.n0(), 0u8);
-    assert_eq!(t.n1(), 1u16);
-    assert_eq!(t.n2(), 2u32);
-    assert_eq!(t.n3(), 3u64);
-    assert_eq!(t.n4(), 4u);
-    assert_eq!(t.n5(), 5i8);
-    assert_eq!(t.n6(), 6i16);
-    assert_eq!(t.n7(), 7i32);
-    assert_eq!(t.n8(), 8i64);
-    assert_eq!(t.n9(), 9i);
-    assert_eq!(t.n10(), 10f32);
-    assert_eq!(t.n11(), 11f64);
-
-    assert_eq!(t.n0_ref(), &0u8);
-    assert_eq!(t.n1_ref(), &1u16);
-    assert_eq!(t.n2_ref(), &2u32);
-    assert_eq!(t.n3_ref(), &3u64);
-    assert_eq!(t.n4_ref(), &4u);
-    assert_eq!(t.n5_ref(), &5i8);
-    assert_eq!(t.n6_ref(), &6i16);
-    assert_eq!(t.n7_ref(), &7i32);
-    assert_eq!(t.n8_ref(), &8i64);
-    assert_eq!(t.n9_ref(), &9i);
-    assert_eq!(t.n10_ref(), &10f32);
-    assert_eq!(t.n11_ref(), &11f64);
+    #[test]
+    fn test_n_tuple() {
+        let t = (0u8, 1u16, 2u32, 3u64, 4u, 5i8, 6i16, 7i32, 8i64, 9i, 10f32, 11f64);
+        assert_eq!(t.n0(), 0u8);
+        assert_eq!(t.n1(), 1u16);
+        assert_eq!(t.n2(), 2u32);
+        assert_eq!(t.n3(), 3u64);
+        assert_eq!(t.n4(), 4u);
+        assert_eq!(t.n5(), 5i8);
+        assert_eq!(t.n6(), 6i16);
+        assert_eq!(t.n7(), 7i32);
+        assert_eq!(t.n8(), 8i64);
+        assert_eq!(t.n9(), 9i);
+        assert_eq!(t.n10(), 10f32);
+        assert_eq!(t.n11(), 11f64);
+
+        assert_eq!(t.n0_ref(), &0u8);
+        assert_eq!(t.n1_ref(), &1u16);
+        assert_eq!(t.n2_ref(), &2u32);
+        assert_eq!(t.n3_ref(), &3u64);
+        assert_eq!(t.n4_ref(), &4u);
+        assert_eq!(t.n5_ref(), &5i8);
+        assert_eq!(t.n6_ref(), &6i16);
+        assert_eq!(t.n7_ref(), &7i32);
+        assert_eq!(t.n8_ref(), &8i64);
+        assert_eq!(t.n9_ref(), &9i);
+        assert_eq!(t.n10_ref(), &10f32);
+        assert_eq!(t.n11_ref(), &11f64);
+    }
 }