---

yaml
---
r: 36701
b: refs/heads/try2
c: e7ef82d
h: refs/heads/master
i:
  36699: c006344
v: v3

Author: brson

[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: 732c39c183bf6a2633095557aa9a3c3c48b84b1b
+refs/heads/try2: e7ef82dd7079bbbdb9db0c22fde0c750b2e4de8c
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libcore/float.rs

@@ -36,7 +36,7 @@ pub use f64::{modf, pow, round, sinh, tanh, tgamma, trunc};
 pub use f64::signbit;
 pub use f64::{j0, j1, jn, y0, y1, yn};
 use cmp::{Eq, Ord};
-use num::from_int;
+use num::Num::from_int;
 
 pub const NaN: float = 0.0/0.0;
 

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

@@ -20,7 +20,7 @@ use T = self::inst::T;
 
 use cmp::{Eq, Ord};
 use from_str::FromStr;
-use num::from_int;
+use num::Num::from_int;
 
 pub const bits : uint = inst::bits;
 pub const bytes : uint = (inst::bits / 8);

branches/try2/src/libcore/iter.rs

@@ -244,7 +244,7 @@ pub pure fn find<A: Copy,IA:BaseIter<A>>(self: &IA,
 #[inline(always)]
 pub pure fn build<A,B: Buildable<A>>(builder: fn(push: pure fn(v: A)))
     -> B {
-    build_sized(4, builder)
+    Buildable::build_sized(4, builder)
 }
 
 /**
@@ -265,7 +265,7 @@ pub pure fn build_sized_opt<A,B: Buildable<A>>(
     size: Option<uint>,
     builder: fn(push: pure fn(v: A))) -> B {
 
-    build_sized(size.get_default(4), builder)
+    Buildable::build_sized(size.get_default(4), builder)
 }
 
 // Functions that combine iteration and building
@@ -288,7 +288,7 @@ pub fn map<T,IT: BaseIter<T>,U,BU: Buildable<U>>(v: &IT, f: fn(&T) -> U)
  */
 pub pure fn from_fn<T,BT: Buildable<T>>(n_elts: uint,
                                         op: InitOp<T>) -> BT {
-    do build_sized(n_elts) |push| {
+    do Buildable::build_sized(n_elts) |push| {
         let mut i: uint = 0u;
         while i < n_elts { push(op(i)); i += 1u; }
     }
@@ -302,7 +302,7 @@ pub pure fn from_fn<T,BT: Buildable<T>>(n_elts: uint,
  */
 pub pure fn from_elem<T: Copy,BT: Buildable<T>>(n_elts: uint,
                                                 t: T) -> BT {
-    do build_sized(n_elts) |push| {
+    do Buildable::build_sized(n_elts) |push| {
         let mut i: uint = 0;
         while i < n_elts { push(t); i += 1; }
     }

branches/try2/src/libcore/path.rs

@@ -29,7 +29,7 @@ pub struct WindowsPath {
 }
 
 pub pure fn WindowsPath(s: &str) -> WindowsPath {
-    from_str(s)
+    GenericPath::from_str(s)
 }
 
 #[deriving_eq]
@@ -39,7 +39,7 @@ pub struct PosixPath {
 }
 
 pub pure fn PosixPath(s: &str) -> PosixPath {
-    from_str(s)
+    GenericPath::from_str(s)
 }
 
 pub trait GenericPath {

branches/try2/src/libstd/workcache.rs

@@ -16,8 +16,7 @@ use either::{Right,Left,Either};
 use json;
 use sha1;
 use serialization::{Serializer,Serializable,
-                    Deserializer,Deserializable,
-                    deserialize};
+                    Deserializer,Deserializable};
 
 /**
 *
@@ -261,7 +260,7 @@ impl Prep {
 
                     let v : T = do io::with_str_reader(res) |rdr| {
                         let j = result::unwrap(json::from_reader(rdr));
-                        deserialize(&json::Deserializer(move j))
+                        Deserializable::deserialize(&json::Deserializer(move j))
                     };
                     return Work::new(self, move Left(move v));
                 }