core: Remove old template files

Author: brson

src/libcore/core.rc

@@ -46,52 +46,52 @@ Implicitly, all crates behave as if they included the following prologue:
 
 /// Operations and constants for `int`
 #[path = "int-template.rs"]
-#[merge = "int-template/intb.rs"]
+#[merge = "int-template/int.rs"]
 pub mod int;
 
 /// Operations and constants for `i8`
 #[path = "int-template.rs"]
-#[merge = "int-template/i8b.rs"]
+#[merge = "int-template/i8.rs"]
 pub mod i8;
 
 /// Operations and constants for `i16`
 #[path = "int-template.rs"]
-#[merge = "int-template/i16b.rs"]
+#[merge = "int-template/i16.rs"]
 pub mod i16;
 
 /// Operations and constants for `i32`
 #[path = "int-template.rs"]
-#[merge = "int-template/i32b.rs"]
+#[merge = "int-template/i32.rs"]
 pub mod i32;
 
 /// Operations and constants for `i64`
 #[path = "int-template.rs"]
-#[merge = "int-template/i64b.rs"]
+#[merge = "int-template/i64.rs"]
 pub mod i64;
 
 /// Operations and constants for `uint`
 #[path = "uint-template.rs"]
-#[merge = "uint-template/uintb.rs"]
+#[merge = "uint-template/uint.rs"]
 pub mod uint;
 
 /// Operations and constants for `u8`
 #[path = "uint-template.rs"]
-#[merge = "uint-template/u8b.rs"]
+#[merge = "uint-template/u8.rs"]
 pub mod u8;
 
 /// Operations and constants for `u16`
 #[path = "uint-template.rs"]
-#[merge = "uint-template/u16b.rs"]
+#[merge = "uint-template/u16.rs"]
 pub mod u16;
 
 /// Operations and constants for `u32`
 #[path = "uint-template.rs"]
-#[merge = "uint-template/u32b.rs"]
+#[merge = "uint-template/u32.rs"]
 pub mod u32;
 
 /// Operations and constants for `u64`
 #[path = "uint-template.rs"]
-#[merge = "uint-template/u64b.rs"]
+#[merge = "uint-template/u64.rs"]
 pub mod u64;
 
 
@@ -121,7 +121,7 @@ pub mod iter;
 pub mod logging;
 pub mod option;
 #[path="iter-trait.rs"]
-#[merge = "iter-trait/optionb.rs"]
+#[merge = "iter-trait/option.rs"]
 pub mod option_iter;
 pub mod result;
 pub mod to_str;
@@ -134,11 +134,11 @@ pub mod clone;
 
 pub mod dvec;
 #[path="iter-trait.rs"]
-#[merge = "iter-trait/dvecb.rs"]
+#[merge = "iter-trait/dvec.rs"]
 pub mod dvec_iter;
 pub mod dlist;
 #[path="iter-trait.rs"]
-#[merge = "iter-trait/dlistb.rs"]
+#[merge = "iter-trait/dlist.rs"]
 pub mod dlist_iter;
 pub mod send_map;
 

src/libcore/int-template/i16.rs

@@ -1,2 +1,4 @@
-pub type T = i16;
-pub const bits: uint = u16::bits;
+mod inst {
+    pub type T = i16;
+    pub const bits: uint = u16::bits;
+}

src/libcore/int-template/i16b.rs

@@ -1,2 +1,4 @@
-pub type T = i32;
-pub const bits: uint = u32::bits;
+mod inst {
+    pub type T = i32;
+    pub const bits: uint = u32::bits;
+}

src/libcore/int-template/i32.rs

@@ -1,2 +1,4 @@
-pub type T = i64;
-pub const bits: uint = u64::bits;
+mod inst {
+    pub type T = i64;
+    pub const bits: uint = u64::bits;
+}

src/libcore/int-template/i32b.rs

@@ -1,2 +1,4 @@
-pub type T = i8;
-pub const bits: uint = u8::bits;
+mod inst {
+    pub type T = i8;
+    pub const bits: uint = u8::bits;
+}

src/libcore/int-template/i64.rs

@@ -1,38 +1,45 @@
-pub type T = int;
-pub const bits: uint = uint::bits;
+pub use inst::pow;
 
-/// Returns `base` raised to the power of `exponent`
-pub fn pow(base: int, exponent: uint) -> int {
-    if exponent == 0u { return 1; } //Not mathemtically true if ~[base == 0]
-    if base     == 0  { return 0; }
-    let mut my_pow  = exponent;
-    let mut acc     = 1;
-    let mut multiplier = base;
-    while(my_pow > 0u) {
-      if my_pow % 2u == 1u {
-         acc *= multiplier;
-      }
-      my_pow     /= 2u;
-      multiplier *= multiplier;
+mod inst {
+    pub type T = int;
+    pub const bits: uint = uint::bits;
+
+    /// Returns `base` raised to the power of `exponent`
+    pub fn pow(base: int, exponent: uint) -> int {
+        if exponent == 0u {
+            //Not mathemtically true if ~[base == 0]
+            return 1;
+        }
+        if base     == 0  { return 0; }
+        let mut my_pow  = exponent;
+        let mut acc     = 1;
+        let mut multiplier = base;
+        while(my_pow > 0u) {
+            if my_pow % 2u == 1u {
+                acc *= multiplier;
+            }
+            my_pow     /= 2u;
+            multiplier *= multiplier;
+        }
+        return acc;
     }
-    return acc;
-}
 
-#[test]
-fn test_pow() {
-    assert (pow(0, 0u) == 1);
-    assert (pow(0, 1u) == 0);
-    assert (pow(0, 2u) == 0);
-    assert (pow(-1, 0u) == 1);
-    assert (pow(1, 0u) == 1);
-    assert (pow(-3, 2u) == 9);
-    assert (pow(-3, 3u) == -27);
-    assert (pow(4, 9u) == 262144);
-}
+    #[test]
+    fn test_pow() {
+        assert (pow(0, 0u) == 1);
+        assert (pow(0, 1u) == 0);
+        assert (pow(0, 2u) == 0);
+        assert (pow(-1, 0u) == 1);
+        assert (pow(1, 0u) == 1);
+        assert (pow(-3, 2u) == 9);
+        assert (pow(-3, 3u) == -27);
+        assert (pow(4, 9u) == 262144);
+    }
 
-#[test]
-fn test_overflows() {
-   assert (max_value > 0);
-   assert (min_value <= 0);
-   assert (min_value + max_value + 1 == 0);
-}
+    #[test]
+    fn test_overflows() {
+        assert (max_value > 0);
+        assert (min_value <= 0);
+        assert (min_value + max_value + 1 == 0);
+    }
+}

src/libcore/int-template/i64b.rs

@@ -1,34 +1,38 @@
-#[allow(non_camel_case_types)]
-pub type IMPL_T<A> = dlist::DList<A>;
+mod inst {
+    #[allow(non_camel_case_types)]
+    pub type IMPL_T<A> = dlist::DList<A>;
 
-/**
- * Iterates through the current contents.
- *
- * Attempts to access this dlist during iteration are allowed (to allow for
- * e.g. breadth-first search with in-place enqueues), but removing the current
- * node is forbidden.
- */
-pub pure fn EACH<A>(self: &IMPL_T<A>, f: fn(v: &A) -> bool) {
-    let mut link = self.peek_n();
-    while option::is_some(&link) {
-        let nobe = option::get(link);
-        assert nobe.linked;
-        if !f(&nobe.data) { break; }
-        // Check (weakly) that the user didn't do a remove.
-        if self.size == 0 {
-            fail ~"The dlist became empty during iteration??"
+    /**
+    * Iterates through the current contents.
+    *
+    * Attempts to access this dlist during iteration are allowed (to
+    * allow for e.g. breadth-first search with in-place enqueues), but
+    * removing the current node is forbidden.
+    */
+    pub pure fn EACH<A>(self: &IMPL_T<A>, f: fn(v: &A) -> bool) {
+        let mut link = self.peek_n();
+        while option::is_some(&link) {
+            let nobe = option::get(link);
+            assert nobe.linked;
+            if !f(&nobe.data) { break; }
+            // Check (weakly) that the user didn't do a remove.
+            if self.size == 0 {
+                fail ~"The dlist became empty during iteration??"
+            }
+            if !nobe.linked ||
+                (!((nobe.prev.is_some()
+                    || box::ptr_eq(*self.hd.expect(~"headless dlist?"),
+                                   *nobe))
+                   && (nobe.next.is_some()
+                    || box::ptr_eq(*self.tl.expect(~"tailless dlist?"),
+                                   *nobe)))) {
+                fail ~"Removing a dlist node during iteration is forbidden!"
+            }
+            link = nobe.next_link();
         }
-        if !nobe.linked ||
-           (!((nobe.prev.is_some()
-               || box::ptr_eq(*self.hd.expect(~"headless dlist?"), *nobe)) &&
-              (nobe.next.is_some()
-               || box::ptr_eq(*self.tl.expect(~"tailless dlist?"), *nobe)))) {
-            fail ~"Removing a dlist node during iteration is forbidden!"
-        }
-        link = nobe.next_link();
     }
-}
 
-pub pure fn SIZE_HINT<A>(self: &IMPL_T<A>) -> Option<uint> {
-    Some(self.len())
-}
+    pub pure fn SIZE_HINT<A>(self: &IMPL_T<A>) -> Option<uint> {
+        Some(self.len())
+    }
+}