---

yaml
---
r: 57773
b: refs/heads/incoming
c: 024bf2e
h: refs/heads/master
i:
  57771: c722e19
v: v3

Author: brendanzab

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: d4868ee74085c2dc2943ef9407ced2d06e43abf6
+refs/heads/incoming: 024bf2ec72bdc2428d5c58a59bfed7da1bbc4efd
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/core.rc

@@ -103,7 +103,8 @@ pub use iter::{BaseIter, ExtendedIter, EqIter, CopyableIter};
 pub use iter::{CopyableOrderedIter, CopyableNonstrictIter, Times};
 pub use iter::{ExtendedMutableIter};
 
-pub use num::{Num, Signed, Unsigned, Natural, NumCast};
+pub use num::{Num, NumCast};
+pub use num::{Signed, Unsigned, Integer};
 pub use ptr::Ptr;
 pub use to_str::ToStr;
 pub use clone::Clone;

branches/incoming/src/libcore/num/int-template.rs

@@ -279,7 +279,7 @@ impl Signed for T {
     fn is_negative(&self) -> bool { *self < 0 }
 }
 
-impl Natural for T {
+impl Integer for T {
     /**
      * Floored integer division
      *

branches/incoming/src/libcore/num/num.rs

@@ -61,7 +61,7 @@ pub fn abs<T:Ord + Zero + Neg<T>>(v: T) -> T {
     if v < Zero::zero() { v.neg() } else { v }
 }
 
-pub trait Natural: Num
+pub trait Integer: Num
                  + Ord
                  + Quot<Self,Self>
                  + Rem<Self,Self> {

branches/incoming/src/libcore/num/uint-template.rs

@@ -176,7 +176,7 @@ impl Neg<T> for T {
 
 impl Unsigned for T {}
 
-impl Natural for T {
+impl Integer for T {
     /// Unsigned integer division. Returns the same result as `quot` (`/`).
     #[inline(always)]
     fn div(&self, other: T) -> T { *self / other }

branches/incoming/src/libcore/prelude.rs

@@ -37,7 +37,8 @@ pub use hash::Hash;
 pub use iter::{BaseIter, ReverseIter, MutableIter, ExtendedIter, EqIter};
 pub use iter::{CopyableIter, CopyableOrderedIter, CopyableNonstrictIter};
 pub use iter::{Times, ExtendedMutableIter};
-pub use num::{Num, Signed, Unsigned, Natural, NumCast};
+pub use num::{Num, NumCast};
+pub use num::{Signed, Unsigned, Integer};
 pub use path::GenericPath;
 pub use path::Path;
 pub use path::PosixPath;