---

yaml
---
r: 62706
b: refs/heads/snap-stage3
c: bf57d65
h: refs/heads/master
v: v3

Author: lilyball

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: e2f8b51dc599cf1fb7f3f72252bef5e5b717f6bd
+refs/heads/snap-stage3: bf57d65a117f2d3634b4eda62001e45fe31b0e9d
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/configure

@@ -555,11 +555,11 @@ then
     CFG_CLANG_VERSION=$("$CFG_CLANG" \
                       --version \
                       | grep version \
-                      | sed 's/.*\(version .*\)/\1/' \
+                      | sed 's/.*\(version .*\)/\1/; s/.*based on \(LLVM .*\))/\1/' \
                       | cut -d ' ' -f 2)
 
     case $CFG_CLANG_VERSION in
-        (3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 4.0* | 4.1* | 4.2*)
+        (3.0svn | 3.0 | 3.1* | 3.2* | 3.3*)
         step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
         CFG_C_COMPILER="clang"
         ;;

branches/snap-stage3/src/libstd/core.rc

@@ -88,24 +88,34 @@ pub mod prelude;
 
 /* Primitive types */
 
-#[path = "num/int_macros.rs"]   mod int_macros;
-#[path = "num/uint_macros.rs"]  mod uint_macros;
-
-#[path = "num/int.rs"]  pub mod int;
-#[path = "num/i8.rs"]   pub mod i8;
-#[path = "num/i16.rs"]  pub mod i16;
-#[path = "num/i32.rs"]  pub mod i32;
-#[path = "num/i64.rs"]  pub mod i64;
-
-#[path = "num/uint.rs"] pub mod uint;
-#[path = "num/u8.rs"]   pub mod u8;
-#[path = "num/u16.rs"]  pub mod u16;
-#[path = "num/u32.rs"]  pub mod u32;
-#[path = "num/u64.rs"]  pub mod u64;
-
-#[path = "num/float.rs"] pub mod float;
-#[path = "num/f32.rs"]   pub mod f32;
-#[path = "num/f64.rs"]   pub mod f64;
+#[path = "num/int-template.rs"] #[merge = "num/int-template/int.rs"]
+pub mod int;
+#[path = "num/int-template.rs"] #[merge = "num/int-template/i8.rs"]
+pub mod i8;
+#[path = "num/int-template.rs"] #[merge = "num/int-template/i16.rs"]
+pub mod i16;
+#[path = "num/int-template.rs"] #[merge = "num/int-template/i32.rs"]
+pub mod i32;
+#[path = "num/int-template.rs"] #[merge = "num/int-template/i64.rs"]
+pub mod i64;
+#[path = "num/uint-template.rs"] #[merge = "num/uint-template/uint.rs"]
+pub mod uint;
+
+#[path = "num/uint-template.rs"] #[merge = "num/uint-template/u8.rs"]
+pub mod u8;
+#[path = "num/uint-template.rs"] #[merge = "num/uint-template/u16.rs"]
+pub mod u16;
+#[path = "num/uint-template.rs"] #[merge = "num/uint-template/u32.rs"]
+pub mod u32;
+#[path = "num/uint-template.rs"] #[merge = "num/uint-template/u64.rs"]
+pub mod u64;
+
+#[path = "num/float.rs"]
+pub mod float;
+#[path = "num/f32.rs"]
+pub mod f32;
+#[path = "num/f64.rs"]
+pub mod f64;
 
 pub mod nil;
 pub mod bool;