---

yaml
---
r: 55862
b: refs/heads/master
c: aa38867
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5de74f3e754628fa98c0cdf0b95b39f39db50e19
+refs/heads/master: aa38867e4e7da648a85985251f542bee12a64095
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
 refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a

trunk/src/libcore/core.rc

@@ -104,8 +104,11 @@ pub use iter::{CopyableOrderedIter, CopyableNonstrictIter, Times};
 pub use iter::{ExtendedMutableIter};
 
 pub use num::{Num, NumCast};
-pub use num::{Signed, Unsigned, Integer};
+pub use num::{Orderable, Signed, Unsigned, Integer};
 pub use num::{Round, Fractional, Real, RealExt};
+pub use num::{Bitwise, BitCount, Bounded};
+pub use num::{Primitive, Int, Float};
+
 pub use ptr::Ptr;
 pub use to_str::ToStr;
 pub use clone::Clone;

trunk/src/libcore/num/cmath.rs

@@ -47,7 +47,8 @@ pub mod c_double_utils {
         unsafe fn fmax(a: c_double, b: c_double) -> c_double;
         #[link_name="fmin"]
         unsafe fn fmin(a: c_double, b: c_double) -> c_double;
-        unsafe fn nextafter(x: c_double, y: c_double) -> c_double;
+        #[link_name="nextafter"]
+        unsafe fn next_after(x: c_double, y: c_double) -> c_double;
         unsafe fn frexp(n: c_double, value: &mut c_int) -> c_double;
         unsafe fn hypot(x: c_double, y: c_double) -> c_double;
         unsafe fn ldexp(x: c_double, n: c_int) -> c_double;
@@ -131,7 +132,7 @@ pub mod c_float_utils {
         #[link_name="fminf"]
         unsafe fn fmin(a: c_float, b: c_float) -> c_float;
         #[link_name="nextafterf"]
-        unsafe fn nextafter(x: c_float, y: c_float) -> c_float;
+        unsafe fn next_after(x: c_float, y: c_float) -> c_float;
         #[link_name="hypotf"]
         unsafe fn hypot(x: c_float, y: c_float) -> c_float;
         #[link_name="ldexpf"]