---

yaml
---
r: 71977
b: refs/heads/dist-snap
c: 0615fdd
h: refs/heads/master
i:
  71975: e3d42ee
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: c4685477e0771ee21afa6b93ea0d4ca2c7f6abd9
+refs/heads/dist-snap: 0615fddd80116d63fba7040bdd89ad59117037dd
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -110,37 +110,29 @@ pub trait NumCast {
 
 macro_rules! impl_num_cast(
     ($T:ty, $conv:ident) => (
-        // FIXME #4375: This enclosing module is necessary because
-        // of a bug with macros expanding into multiple items
-        pub mod $conv {
-            use num::NumCast;
-
-            #[cfg(notest)]
-            impl NumCast for $T {
-                #[doc = "Cast `n` to a `$T`"]
-                #[inline(always)]
-                fn from<N:NumCast>(n: N) -> $T {
-                    // `$conv` could be generated using `concat_idents!`, but that
-                    // macro seems to be broken at the moment
-                    n.$conv()
-                }
-
-                #[inline(always)] fn to_u8(&self)    -> u8    { *self as u8    }
-                #[inline(always)] fn to_u16(&self)   -> u16   { *self as u16   }
-                #[inline(always)] fn to_u32(&self)   -> u32   { *self as u32   }
-                #[inline(always)] fn to_u64(&self)   -> u64   { *self as u64   }
-                #[inline(always)] fn to_uint(&self)  -> uint  { *self as uint  }
-
-                #[inline(always)] fn to_i8(&self)    -> i8    { *self as i8    }
-                #[inline(always)] fn to_i16(&self)   -> i16   { *self as i16   }
-                #[inline(always)] fn to_i32(&self)   -> i32   { *self as i32   }
-                #[inline(always)] fn to_i64(&self)   -> i64   { *self as i64   }
-                #[inline(always)] fn to_int(&self)   -> int   { *self as int   }
-
-                #[inline(always)] fn to_f32(&self)   -> f32   { *self as f32   }
-                #[inline(always)] fn to_f64(&self)   -> f64   { *self as f64   }
-                #[inline(always)] fn to_float(&self) -> float { *self as float }
+        impl NumCast for $T {
+            #[inline(always)]
+            fn from<N:NumCast>(n: N) -> $T {
+                // `$conv` could be generated using `concat_idents!`, but that
+                // macro seems to be broken at the moment
+                n.$conv()
             }
+
+            #[inline(always)] fn to_u8(&self)    -> u8    { *self as u8    }
+            #[inline(always)] fn to_u16(&self)   -> u16   { *self as u16   }
+            #[inline(always)] fn to_u32(&self)   -> u32   { *self as u32   }
+            #[inline(always)] fn to_u64(&self)   -> u64   { *self as u64   }
+            #[inline(always)] fn to_uint(&self)  -> uint  { *self as uint  }
+
+            #[inline(always)] fn to_i8(&self)    -> i8    { *self as i8    }
+            #[inline(always)] fn to_i16(&self)   -> i16   { *self as i16   }
+            #[inline(always)] fn to_i32(&self)   -> i32   { *self as i32   }
+            #[inline(always)] fn to_i64(&self)   -> i64   { *self as i64   }
+            #[inline(always)] fn to_int(&self)   -> int   { *self as int   }
+
+            #[inline(always)] fn to_f32(&self)   -> f32   { *self as f32   }
+            #[inline(always)] fn to_f64(&self)   -> f64   { *self as f64   }
+            #[inline(always)] fn to_float(&self) -> float { *self as float }
         }
     )
 )