---

yaml
---
r: 36837
b: refs/heads/try2
c: e8102e7
h: refs/heads/master
i:
  36835: 01426b6
v: v3

Author: erickt

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 8554d5e7104be30d20ce8e8dc08239ce20b171c2
+refs/heads/try2: e8102e73a91de261556cddd0d055e69234a37a82
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libcore/f32.rs

@@ -174,6 +174,14 @@ impl f32: num::Num {
     static pure fn from_int(n: int) -> f32 { return n as f32;    }
 }
 
+impl f32: num::Zero {
+    static pure fn zero() -> f32 { 0.0 }
+}
+
+impl f32: num::One {
+    static pure fn one() -> f32 { 1.0 }
+}
+
 //
 // Local Variables:
 // mode: rust

branches/try2/src/libcore/f64.rs

@@ -193,6 +193,14 @@ impl f64: num::Num {
     static pure fn from_int(n: int) -> f64 { return n as f64;    }
 }
 
+impl f64: num::Zero {
+    static pure fn zero() -> f64 { 0.0 }
+}
+
+impl f64: num::One {
+    static pure fn one() -> f64 { 1.0 }
+}
+
 //
 // Local Variables:
 // mode: rust

branches/try2/src/libcore/float.rs

@@ -443,6 +443,14 @@ impl float: num::Num {
     static pure fn from_int(&self, n: int) -> float { return n as float;  }
 }
 
+impl float: num::Zero {
+    static pure fn zero() -> float { 0.0 }
+}
+
+impl float: num::One {
+    static pure fn one() -> float { 1.0 }
+}
+
 #[test]
 pub fn test_from_str() {
    assert from_str(~"3") == Some(3.);

branches/try2/src/libcore/int-template.rs

@@ -91,6 +91,14 @@ impl T: num::Num {
     static pure fn from_int(n: int) -> T   { return n as T;      }
 }
 
+impl T: num::Zero {
+    static pure fn zero() -> T { 0 }
+}
+
+impl T: num::One {
+    static pure fn one() -> T { 1 }
+}
+
 impl T: iter::Times {
     #[inline(always)]
     #[doc = "A convenience form for basic iteration. Given a variable `x` \

branches/try2/src/libcore/num.rs

@@ -22,3 +22,11 @@ pub trait Num {
     pure fn to_int(&self) -> int;
     static pure fn from_int(n: int) -> self;
 }
+
+pub trait Zero {
+    static pure fn zero() -> self;
+}
+
+pub trait One {
+    static pure fn one() -> self;
+}

branches/try2/src/libcore/uint-template.rs

@@ -85,6 +85,14 @@ impl T: num::Num {
     static pure fn from_int(n: int) -> T   { return n as T;      }
 }
 
+impl T: num::Zero {
+    static pure fn zero() -> T { 0 }
+}
+
+impl T: num::One {
+    static pure fn one() -> T { 1 }
+}
+
 impl T: iter::Times {
     #[inline(always)]
     #[doc = "A convenience form for basic iteration. Given a variable `x` \