diff --git a/src/libcore/float.rs b/src/libcore/float.rs
index 2a86d7ae04f..2ea9c5925ef 100644
--- a/src/libcore/float.rs
+++ b/src/libcore/float.rs
@@ -36,7 +36,7 @@
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;
diff --git a/src/libcore/int-template.rs b/src/libcore/int-template.rs
index 3878d6a5205..c61e2126374 100644
--- a/src/libcore/int-template.rs
+++ b/src/libcore/int-template.rs
@@ -20,7 +20,7 @@
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);
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
index 4b35417f23b..7685fe06ad9 100644
--- a/src/libcore/iter.rs
+++ b/src/libcore/iter.rs
@@ -244,7 +244,7 @@ pub trait Buildable {
#[inline(always)]
pub pure fn build>(builder: fn(push: pure fn(v: A)))
-> B {
- build_sized(4, builder)
+ Buildable::build_sized(4, builder)
}
/**
@@ -265,7 +265,7 @@ pub trait Buildable {
size: Option,
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,U,BU: Buildable>(v: &IT, f: fn(&T) -> U)
*/
pub pure fn from_fn>(n_elts: uint,
op: InitOp) -> 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 fn map,U,BU: Buildable>(v: &IT, f: fn(&T) -> U)
*/
pub pure fn from_elem>(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; }
}
diff --git a/src/libcore/path.rs b/src/libcore/path.rs
index cdd66364c11..65ed3515931 100644
--- a/src/libcore/path.rs
+++ b/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 {
diff --git a/src/libstd/workcache.rs b/src/libstd/workcache.rs
index 71151c33060..b80838420f0 100644
--- a/src/libstd/workcache.rs
+++ b/src/libstd/workcache.rs
@@ -16,8 +16,7 @@
use json;
use sha1;
use serialization::{Serializer,Serializable,
- Deserializer,Deserializable,
- deserialize};
+ Deserializer,Deserializable};
/**
*
@@ -261,7 +260,7 @@ fn exec