  pub use num::dec2flt::ParseFloatError;
  
  // Conversion traits for primitive integer and float types
-@@ -2026,6 +2031,9 @@
+@@ -1865,6 +1870,9 @@
  // they fit in the significand, which is 24 bits in f32 and 53 bits in f64.
  // Lossy float conversions are not implemented at this time.
  

 
 /// The `SubAssign` trait is used to specify the functionality of `-=`.
 ///
@@ -1024,7 +1036,9 @@
 }
 
 #[cfg(not(stage0))]
-sub_assign_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 }
+sub_assign_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
+#[cfg(not(disable_float))]

+}
 
+extern "rust-intrinsic" {
     /// Returns the number of bits set in an integer type `T`
     pub fn ctpop<T>(x: T) -> T;
 
Only in libcore/: intrinsics.rs.orig
Only in libcore/: intrinsics.rs.rej
diff -rub libcore_orig/lib.rs libcore/lib.rs
--- libcore_orig/lib.rs	2015-12-24 19:08:00.238776800 +0800
+++ libcore/lib.rs	2015-12-24 19:03:03.668177600 +0800
@@ -101,7 +101,9 @@
 #[path = "num/u32.rs"]  pub mod u32;
 #[path = "num/u64.rs"]  pub mod u64;
 
