diff --git a/src/lib/_int.rs b/src/lib/_int.rs index 38e161bcfa20..ee660f013b22 100644 --- a/src/lib/_int.rs +++ b/src/lib/_int.rs @@ -1,4 +1,3 @@ -import std.sys; fn add(int x, int y) -> int { ret x + y; } fn sub(int x, int y) -> int { ret x - y; } diff --git a/src/lib/_str.rs b/src/lib/_str.rs index 0e0e7650943b..3f45334924d8 100644 --- a/src/lib/_str.rs +++ b/src/lib/_str.rs @@ -1,6 +1,6 @@ import rustrt.sbuf; -import std._vec.rustrt.vbuf; +import _vec.rustrt.vbuf; native "rust" mod rustrt { type sbuf; diff --git a/src/lib/_uint.rs b/src/lib/_uint.rs index 79b5fa242b3c..ceee9c774789 100644 --- a/src/lib/_uint.rs +++ b/src/lib/_uint.rs @@ -1,4 +1,3 @@ -import std.sys; fn add(uint x, uint y) -> uint { ret x + y; } fn sub(uint x, uint y) -> uint { ret x - y; } diff --git a/src/lib/_vec.rs b/src/lib/_vec.rs index 2ffe8bad08b3..680c8884f6d1 100644 --- a/src/lib/_vec.rs +++ b/src/lib/_vec.rs @@ -1,5 +1,4 @@ import vbuf = rustrt.vbuf; -import std.option; type operator2[T,U,V] = fn(&T, &U) -> V; diff --git a/src/lib/bitv.rs b/src/lib/bitv.rs index adb3dc862790..2322c693b4d1 100644 --- a/src/lib/bitv.rs +++ b/src/lib/bitv.rs @@ -1,7 +1,3 @@ -import std._uint; -import std._int; -import std._vec; - // FIXME: With recursive object types, we could implement binary methods like // union, intersection, and difference. At that point, we could write // an optimizing version of this module that produces a different obj diff --git a/src/lib/dbg.rs b/src/lib/dbg.rs index 774052dcaf51..b63f363e7027 100644 --- a/src/lib/dbg.rs +++ b/src/lib/dbg.rs @@ -5,8 +5,6 @@ * logging. */ -import std._vec; - // FIXME: handle 64-bit case. const uint const_refcount = 0x7bad_face_u; diff --git a/src/lib/deque.rs b/src/lib/deque.rs index 1602345703d5..776f82e99fe8 100644 --- a/src/lib/deque.rs +++ b/src/lib/deque.rs @@ -2,10 +2,6 @@ * A deque, for fun. Untested as of yet. Likely buggy. */ -import std.option; -import std._vec; -import std._int; - type t[T] = obj { fn size() -> uint; diff --git a/src/lib/io.rs b/src/lib/io.rs index dbe6de7a63bf..34c4a98d9ac4 100644 --- a/src/lib/io.rs +++ b/src/lib/io.rs @@ -1,7 +1,4 @@ -import std.os.libc; -import std._str; -import std._vec; - +import os.libc; type stdio_reader = state obj { fn getc() -> int; diff --git a/src/lib/list.rs b/src/lib/list.rs index c4661940a5fe..58c2cded6e64 100644 --- a/src/lib/list.rs +++ b/src/lib/list.rs @@ -1,5 +1,3 @@ - -import std.option; import option.some; import option.none; diff --git a/src/lib/map.rs b/src/lib/map.rs index 7f760b659677..29e9ba5d6915 100644 --- a/src/lib/map.rs +++ b/src/lib/map.rs @@ -3,12 +3,6 @@ * use, but useful as a stress test for rustboot. */ -import std._int; -import std.sys; -import std.option; -import std._vec; - - type hashfn[K] = fn(&K) -> uint; type eqfn[K] = fn(&K, &K) -> bool; diff --git a/src/lib/sha1.rs b/src/lib/sha1.rs index 2a6b74d4ff32..a57ea894cdfb 100644 --- a/src/lib/sha1.rs +++ b/src/lib/sha1.rs @@ -4,9 +4,6 @@ * point this will want to be rewritten. */ -import std._vec; -import std._str; - export sha1; export mk_sha1;