---

yaml
---
r: 23234
b: refs/heads/master
c: ccd3643
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f78c90653535128b5a7c08d4850d6ef202beba40
+refs/heads/master: ccd36439f70814073c567bb22fdbcaafcf970b16
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/f32.rs

@@ -180,7 +180,7 @@ impl f32: num::Num {
     pure fn neg()                -> f32 { return -self;        }
 
     pure fn to_int()         -> int { return self as int; }
-    pure fn from_int(n: int) -> f32 { return n as f32;    }
+    static pure fn from_int(n: int) -> f32 { return n as f32;    }
 }
 
 //

trunk/src/libcore/f64.rs

@@ -207,7 +207,7 @@ impl f64: num::Num {
     pure fn neg()                -> f64 { return -self;        }
 
     pure fn to_int()         -> int { return self as int; }
-    pure fn from_int(n: int) -> f64 { return n as f64;    }
+    static pure fn from_int(n: int) -> f64 { return n as f64;    }
 }
 
 //

trunk/src/libcore/float.rs

@@ -422,7 +422,7 @@ impl float: num::Num {
     pure fn neg()                  -> float { return -self;        }
 
     pure fn to_int()         -> int   { return self as int; }
-    pure fn from_int(n: int) -> float { return n as float;  }
+    static pure fn from_int(n: int) -> float { return n as float;  }
 }
 
 #[test]
@@ -523,14 +523,14 @@ fn test_traits() {
     fn test<U:num::Num>(ten: &U) {
         assert (ten.to_int() == 10);
 
-        let two = ten.from_int(2);
+        let two = from_int(2);
         assert (two.to_int() == 2);
 
-        assert (ten.add(two) == ten.from_int(12));
-        assert (ten.sub(two) == ten.from_int(8));
-        assert (ten.mul(two) == ten.from_int(20));
-        assert (ten.div(two) == ten.from_int(5));
-        assert (ten.modulo(two) == ten.from_int(0));
+        assert (ten.add(two) == from_int(12));
+        assert (ten.sub(two) == from_int(8));
+        assert (ten.mul(two) == from_int(20));
+        assert (ten.div(two) == from_int(5));
+        assert (ten.modulo(two) == from_int(0));
     }
 
     test(&10.0);

trunk/src/libcore/int-template.rs

@@ -84,7 +84,7 @@ impl T: num::Num {
     pure fn neg()              -> T { return -self;        }
 
     pure fn to_int()         -> int { return self as int; }
-    pure fn from_int(n: int) -> T   { return n as T;      }
+    static pure fn from_int(n: int) -> T   { return n as T;      }
 }
 
 impl T: iter::times {
@@ -238,15 +238,15 @@ fn test_interfaces() {
     fn test<U:num::Num>(ten: U) {
         assert (ten.to_int() == 10);
 
-        let two = ten.from_int(2);
+        let two = from_int(2);
         assert (two.to_int() == 2);
 
-        assert (ten.add(two) == ten.from_int(12));
-        assert (ten.sub(two) == ten.from_int(8));
-        assert (ten.mul(two) == ten.from_int(20));
-        assert (ten.div(two) == ten.from_int(5));
-        assert (ten.modulo(two) == ten.from_int(0));
-        assert (ten.neg() == ten.from_int(-10));
+        assert (ten.add(two) == from_int(12));
+        assert (ten.sub(two) == from_int(8));
+        assert (ten.mul(two) == from_int(20));
+        assert (ten.div(two) == from_int(5));
+        assert (ten.modulo(two) == from_int(0));
+        assert (ten.neg() == from_int(-10));
     }
 
     test(10 as T);

trunk/src/libcore/num.rs

@@ -1,7 +1,6 @@
 /// An interface for numbers.
 
 trait Num {
-    // FIXME: Cross-crate overloading doesn't work yet. (#2615)
     // FIXME: Trait composition. (#2616)
     pure fn add(&&other: self) -> self;
     pure fn sub(&&other: self) -> self;
@@ -11,7 +10,5 @@ trait Num {
     pure fn neg() -> self;
 
     pure fn to_int() -> int;
-    pure fn from_int(n: int) -> self;    // FIXME (#2376) Static functions.
-    // n.b. #2376 is for classes, not traits, but it could be generalized...
+    static pure fn from_int(n: int) -> self;
 }
-

trunk/src/libcore/uint-template.rs

@@ -77,7 +77,7 @@ impl T: num::Num {
     pure fn neg()              -> T { return -self;        }
 
     pure fn to_int()         -> int { return self as int; }
-    pure fn from_int(n: int) -> T   { return n as T;      }
+    static pure fn from_int(n: int) -> T   { return n as T;      }
 }
 
 impl T: iter::times {