diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs index 9f0fbe1d328b..de8aa4bfa1b7 100644 --- a/src/comp/back/link.rs +++ b/src/comp/back/link.rs @@ -5,7 +5,6 @@ import front::attr; import middle::ty; import metadata::encoder; import middle::trans_common::crate_ctxt; -import std::str; import std::istr; import std::fs; import std::vec; diff --git a/src/comp/back/x86.rs b/src/comp/back/x86.rs index 727bb319ae8e..6823f8c20309 100644 --- a/src/comp/back/x86.rs +++ b/src/comp/back/x86.rs @@ -1,7 +1,6 @@ import lib::llvm::llvm; import lib::llvm::llvm::ModuleRef; -import std::str; import std::istr; import std::os::target_os; diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs index daa36a67bdae..71537effd032 100644 --- a/src/comp/driver/rustc.rs +++ b/src/comp/driver/rustc.rs @@ -26,7 +26,6 @@ import std::map::mk_hashmap; import std::option; import std::option::some; import std::option::none; -import std::str; import std::istr; import std::vec; import std::int; diff --git a/src/comp/driver/session.rs b/src/comp/driver/session.rs index 9f952041df14..cf5841b12276 100644 --- a/src/comp/driver/session.rs +++ b/src/comp/driver/session.rs @@ -9,7 +9,6 @@ import std::map; import std::option; import std::option::some; import std::option::none; -import std::str; import std::istr; import syntax::parse::parser::parse_sess; diff --git a/src/comp/front/attr.rs b/src/comp/front/attr.rs index 876a6cbc8b68..5d122ce771d7 100644 --- a/src/comp/front/attr.rs +++ b/src/comp/front/attr.rs @@ -1,7 +1,6 @@ // Functions dealing with attributes and meta_items import std::vec; -import std::str; import std::istr; import std::map; import std::option; diff --git a/src/comp/metadata/creader.rs b/src/comp/metadata/creader.rs index 5100037ea7dd..64b198b861a8 100644 --- a/src/comp/metadata/creader.rs +++ b/src/comp/metadata/creader.rs @@ -14,7 +14,6 @@ import syntax::codemap::span; import back::x86; import util::common; import std::vec; -import std::str; import std::istr; import std::fs; import std::io; diff --git a/src/comp/metadata/cstore.rs b/src/comp/metadata/cstore.rs index 5ff01c946468..b286e155f7ab 100644 --- a/src/comp/metadata/cstore.rs +++ b/src/comp/metadata/cstore.rs @@ -3,7 +3,6 @@ import std::vec; import std::map; -import std::str; import std::istr; import syntax::ast; diff --git a/src/comp/metadata/decoder.rs b/src/comp/metadata/decoder.rs index a3637b178a04..e6a44618cf9a 100644 --- a/src/comp/metadata/decoder.rs +++ b/src/comp/metadata/decoder.rs @@ -3,7 +3,6 @@ import std::ebml; import std::vec; import std::option; -import std::str; import std::istr; import std::io; import std::map::hashmap; diff --git a/src/comp/metadata/encoder.rs b/src/comp/metadata/encoder.rs index b403ef7de8bb..e4e8ff1bbe92 100644 --- a/src/comp/metadata/encoder.rs +++ b/src/comp/metadata/encoder.rs @@ -1,7 +1,6 @@ // Metadata encoding import std::vec; -import std::str; import std::istr; import std::uint; import std::io; diff --git a/src/comp/metadata/tydecode.rs b/src/comp/metadata/tydecode.rs index 5da912257f9d..9f5a0dca4d67 100644 --- a/src/comp/metadata/tydecode.rs +++ b/src/comp/metadata/tydecode.rs @@ -1,7 +1,6 @@ // Type decoding import std::vec; -import std::str; import std::istr; import std::uint; import std::option; diff --git a/src/comp/middle/alias.rs b/src/comp/middle/alias.rs index e14bf1d57287..5d42131e3af6 100644 --- a/src/comp/middle/alias.rs +++ b/src/comp/middle/alias.rs @@ -10,7 +10,6 @@ import syntax::codemap::span; import syntax::visit; import visit::vt; import std::vec; -import std::str; import std::istr; import std::option; import std::option::some; diff --git a/src/comp/middle/gc.rs b/src/comp/middle/gc.rs index 8fbe5e39ee3d..3932e9c07358 100644 --- a/src/comp/middle/gc.rs +++ b/src/comp/middle/gc.rs @@ -10,7 +10,6 @@ import middle::ty; import std::option::none; import std::option::some; import std::ptr; -import std::str; import std::istr; import std::unsafe; import std::vec; diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs index ca688f533ecb..e712abaa751e 100644 --- a/src/comp/middle/resolve.rs +++ b/src/comp/middle/resolve.rs @@ -32,7 +32,6 @@ import std::option; import std::option::is_none; import std::option::some; import std::option::none; -import std::str; import std::istr; import syntax::print::pprust::*; diff --git a/src/comp/middle/shape.rs b/src/comp/middle/shape.rs index 5fe852005640..0a000fd6f68d 100644 --- a/src/comp/middle/shape.rs +++ b/src/comp/middle/shape.rs @@ -30,7 +30,6 @@ import std::vec; import std::map::hashmap; import std::option::none; import std::option::some; -import std::str; import std::istr; import ty_ctxt = middle::ty::ctxt; diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index c7078b849041..3cf955eba109 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -13,7 +13,6 @@ // but many TypeRefs correspond to one ty::t; for instance, tup(int, int, // int) and rec(x=int, y=int, z=int) will have the same TypeRef. import std::int; -import std::str; import std::istr; import std::uint; import std::map; diff --git a/src/comp/middle/trans_alt.rs b/src/comp/middle/trans_alt.rs index 6dddf42caeb3..e8fc3f33c0f1 100644 --- a/src/comp/middle/trans_alt.rs +++ b/src/comp/middle/trans_alt.rs @@ -1,4 +1,3 @@ -import std::str; import std::istr; import std::vec; import std::option; diff --git a/src/comp/middle/trans_build.rs b/src/comp/middle/trans_build.rs index 97904e9cbf57..9cad896c9492 100644 --- a/src/comp/middle/trans_build.rs +++ b/src/comp/middle/trans_build.rs @@ -1,4 +1,4 @@ -import std::{vec, str, istr}; +import std::{vec, istr}; import std::istr::sbuf; import lib::llvm::llvm; import llvm::{ValueRef, TypeRef, BasicBlockRef, BuilderRef, diff --git a/src/comp/middle/trans_common.rs b/src/comp/middle/trans_common.rs index 1e60daec4702..9cee76c1db61 100644 --- a/src/comp/middle/trans_common.rs +++ b/src/comp/middle/trans_common.rs @@ -6,7 +6,6 @@ import std::int; import std::vec; import std::vec::to_ptr; -import std::str; import std::istr; import std::uint; import std::map; diff --git a/src/comp/middle/trans_objects.rs b/src/comp/middle/trans_objects.rs index 1268fa1ee17b..49da4aba9a03 100644 --- a/src/comp/middle/trans_objects.rs +++ b/src/comp/middle/trans_objects.rs @@ -1,6 +1,5 @@ // Translation of object-related things to LLVM IR. -import std::str; import std::istr; import std::option; import std::vec; diff --git a/src/comp/middle/tstate/auxiliary.rs b/src/comp/middle/tstate/auxiliary.rs index d4caf9bc03d7..bdc94f803cf5 100644 --- a/src/comp/middle/tstate/auxiliary.rs +++ b/src/comp/middle/tstate/auxiliary.rs @@ -1,6 +1,5 @@ import std::vec; import std::int::str; -import std::str; import std::istr; import std::option; import std::option::*; diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs index f24eee8123c3..5a09bfa9b6f1 100644 --- a/src/comp/middle/ty.rs +++ b/src/comp/middle/ty.rs @@ -1,6 +1,5 @@ import std::int; import std::vec; -import std::str; import std::istr; import std::uint; import std::box; diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs index 21137bdb6523..23153a23e291 100644 --- a/src/comp/middle/typeck.rs +++ b/src/comp/middle/typeck.rs @@ -36,7 +36,6 @@ import middle::ty::unify::fix_ok; import middle::ty::unify::fix_err; import std::int; import std::vec; -import std::str; import std::istr; import std::uint; import std::map; diff --git a/src/comp/syntax/ast.rs b/src/comp/syntax/ast.rs index 582da17f465a..f6a34e5c544e 100644 --- a/src/comp/syntax/ast.rs +++ b/src/comp/syntax/ast.rs @@ -1,7 +1,6 @@ // The Rust abstract syntax tree. import std::option; -import std::str; import codemap::span; import codemap::filename; diff --git a/src/comp/syntax/ast_util.rs b/src/comp/syntax/ast_util.rs index 1052ef195fa7..5481229a7624 100644 --- a/src/comp/syntax/ast_util.rs +++ b/src/comp/syntax/ast_util.rs @@ -1,4 +1,3 @@ -import std::str; import std::istr; import std::option; import codemap::span; diff --git a/src/comp/syntax/codemap.rs b/src/comp/syntax/codemap.rs index 9c9a0049cf13..14dc3e46448a 100644 --- a/src/comp/syntax/codemap.rs +++ b/src/comp/syntax/codemap.rs @@ -1,6 +1,5 @@ import std::vec; import std::uint; -import std::str; import std::istr; import std::term; import std::io; diff --git a/src/comp/syntax/ext/ifmt.rs b/src/comp/syntax/ext/ifmt.rs index 4fcb1db8816c..b48d73d0fc5f 100644 --- a/src/comp/syntax/ext/ifmt.rs +++ b/src/comp/syntax/ext/ifmt.rs @@ -6,7 +6,6 @@ * compiler syntax extension plugin interface. */ import std::vec; -import std::str; import std::istr; import std::option; import std::option::none; diff --git a/src/comp/syntax/parse/eval.rs b/src/comp/syntax/parse/eval.rs index 1a4b3c9c29f9..6318c4c769bb 100644 --- a/src/comp/syntax/parse/eval.rs +++ b/src/comp/syntax/parse/eval.rs @@ -1,5 +1,4 @@ -import std::str; import std::istr; import std::option; import std::option::some; diff --git a/src/comp/syntax/parse/lexer.rs b/src/comp/syntax/parse/lexer.rs index fa147faa1ccc..37eddf59abe7 100644 --- a/src/comp/syntax/parse/lexer.rs +++ b/src/comp/syntax/parse/lexer.rs @@ -2,7 +2,6 @@ import std::io; import std::int; import std::vec; -import std::str; import std::istr; import std::map; import std::map::hashmap; diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs index 9c61f569e211..cf3c02cb03a2 100644 --- a/src/comp/syntax/parse/parser.rs +++ b/src/comp/syntax/parse/parser.rs @@ -1,7 +1,6 @@ import std::io; import std::vec; -import std::str; import std::istr; import std::option; import std::option::some; diff --git a/src/comp/syntax/parse/token.rs b/src/comp/syntax/parse/token.rs index b83a2f27e318..6ae2affdb043 100644 --- a/src/comp/syntax/parse/token.rs +++ b/src/comp/syntax/parse/token.rs @@ -5,7 +5,6 @@ import std::map::new_str_hash; import util::interner; import std::int; import std::uint; -import std::str; import std::istr; type str_num = uint; diff --git a/src/comp/syntax/print/pp.rs b/src/comp/syntax/print/pp.rs index 59460a07e069..ae94fb959b57 100644 --- a/src/comp/syntax/print/pp.rs +++ b/src/comp/syntax/print/pp.rs @@ -1,7 +1,6 @@ import std::io; import std::vec; -import std::str; import std::istr; /* diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs index c01ede9d391f..fa6891a08121 100644 --- a/src/comp/syntax/print/pprust.rs +++ b/src/comp/syntax/print/pprust.rs @@ -2,7 +2,6 @@ import std::vec; import std::int; import std::io; -import std::str; import std::istr; import std::uint; import std::option; diff --git a/src/comp/util/common.rs b/src/comp/util/common.rs index 18a1ff84c228..da0fba4a96a8 100644 --- a/src/comp/util/common.rs +++ b/src/comp/util/common.rs @@ -1,4 +1,3 @@ -import std::str; import std::istr; import std::map; import std::map::hashmap; diff --git a/src/comp/util/ppaux.rs b/src/comp/util/ppaux.rs index 4ec69b61245f..5e7e7e3fd782 100644 --- a/src/comp/util/ppaux.rs +++ b/src/comp/util/ppaux.rs @@ -1,5 +1,4 @@ import std::vec; -import std::str; import std::istr; import std::int; import std::option; diff --git a/src/fuzzer/fuzzer.rs b/src/fuzzer/fuzzer.rs index cf42c2adc827..8a30e0caba1b 100644 --- a/src/fuzzer/fuzzer.rs +++ b/src/fuzzer/fuzzer.rs @@ -9,7 +9,6 @@ import std::getopts::opt_str; import std::io; import std::io::stdout; import std::vec; -import std::str; import std::istr; import std::uint; import std::option; diff --git a/src/lib/fs.rs b/src/lib/fs.rs index abc8c14ea3a9..297c27cb2a85 100644 --- a/src/lib/fs.rs +++ b/src/lib/fs.rs @@ -1,7 +1,6 @@ import os::getcwd; import os_fs; -import str; native "rust" mod rustrt { fn rust_file_is_dir(path: istr::sbuf) -> int; diff --git a/src/lib/net.rs b/src/lib/net.rs index f85b8ccabbe0..4dac4eee04c7 100644 --- a/src/lib/net.rs +++ b/src/lib/net.rs @@ -1,4 +1,3 @@ -import str; import vec; import uint; diff --git a/src/lib/sio.rs b/src/lib/sio.rs index 9040210b8267..83397d132c2f 100644 --- a/src/lib/sio.rs +++ b/src/lib/sio.rs @@ -3,7 +3,6 @@ import comm::chan; import comm::send; import comm::recv; -import str; import net; type ctx = aio::ctx; diff --git a/src/lib/std.rc b/src/lib/std.rc index 36244838f4c6..21b09312860a 100644 --- a/src/lib/std.rc +++ b/src/lib/std.rc @@ -15,7 +15,6 @@ mod uint; mod u8; mod u64; mod vec; -mod str; mod istr; // General io and system-services modules. diff --git a/src/lib/str.rs b/src/lib/str.rs deleted file mode 100644 index b6b13e399b86..000000000000 --- a/src/lib/str.rs +++ /dev/null @@ -1,10 +0,0 @@ -export unsafe_from_bytes; - -native "rust" mod rustrt { - fn str_from_vec(b: &[mutable? u8]) -> str; - fn refcount(s: str) -> uint; -} - -fn unsafe_from_bytes(v: &[mutable? u8]) -> str { - ret rustrt::str_from_vec(v); -} diff --git a/src/test/bench/99bob-pattern.rs b/src/test/bench/99bob-pattern.rs index 0938532fce28..dae406b09825 100644 --- a/src/test/bench/99bob-pattern.rs +++ b/src/test/bench/99bob-pattern.rs @@ -6,7 +6,6 @@ */ use std; import std::int; -import std::str; import std::istr; tag bottle { none; dual; single; multiple(int); } diff --git a/src/test/bench/99bob-tail.rs b/src/test/bench/99bob-tail.rs index 6e84bcd58a3d..80c8fdd0cdaa 100644 --- a/src/test/bench/99bob-tail.rs +++ b/src/test/bench/99bob-tail.rs @@ -4,7 +4,6 @@ */ use std; import std::int; -import std::str; import std::istr; fn main() { diff --git a/src/test/compiletest/compiletest.rs b/src/test/compiletest/compiletest.rs index 0408983e746f..a7d0d1205494 100644 --- a/src/test/compiletest/compiletest.rs +++ b/src/test/compiletest/compiletest.rs @@ -2,7 +2,6 @@ import std::option; import std::getopts; import std::test; import std::fs; -import std::str; import std::istr; import std::vec; import std::task; diff --git a/src/test/compiletest/header.rs b/src/test/compiletest/header.rs index 0c8eff0aac90..1ba29dddbdaa 100644 --- a/src/test/compiletest/header.rs +++ b/src/test/compiletest/header.rs @@ -1,5 +1,4 @@ import std::option; -import std::str; import std::istr; import std::io; import std::fs; diff --git a/src/test/compiletest/procsrv.rs b/src/test/compiletest/procsrv.rs index 3fb2bfc37002..a31dff23dcbc 100644 --- a/src/test/compiletest/procsrv.rs +++ b/src/test/compiletest/procsrv.rs @@ -12,7 +12,6 @@ import std::vec; import std::os; import std::run; import std::io; -import std::str; import std::istr; import std::comm::chan; import std::comm::port; diff --git a/src/test/compiletest/runtest.rs b/src/test/compiletest/runtest.rs index 4339ab18690a..0ffe3c0697df 100644 --- a/src/test/compiletest/runtest.rs +++ b/src/test/compiletest/runtest.rs @@ -1,5 +1,4 @@ import std::io; -import std::str; import std::istr; import std::option; import std::fs; diff --git a/src/test/run-fail/fmt-fail.rs b/src/test/run-fail/fmt-fail.rs index e61a3ffeb360..67814d12c45f 100644 --- a/src/test/run-fail/fmt-fail.rs +++ b/src/test/run-fail/fmt-fail.rs @@ -1,6 +1,5 @@ // error-pattern:meh // no-valgrind use std; -import std::str; fn main() { let str_var: istr = ~"meh"; fail #ifmt["%s", str_var]; } diff --git a/src/test/run-fail/fn-constraint-claim.rs b/src/test/run-fail/fn-constraint-claim.rs index a5309b616272..d126b7e93187 100644 --- a/src/test/run-fail/fn-constraint-claim.rs +++ b/src/test/run-fail/fn-constraint-claim.rs @@ -1,6 +1,5 @@ // error-pattern:quux use std; -import std::str::*; import std::uint::*; fn nop(a: uint, b: uint) : le(a, b) { fail "quux"; } diff --git a/src/test/run-pass/claim-nonterm.rs b/src/test/run-pass/claim-nonterm.rs index 13741ef3961c..3ef1584770bd 100644 --- a/src/test/run-pass/claim-nonterm.rs +++ b/src/test/run-pass/claim-nonterm.rs @@ -1,6 +1,5 @@ // tests that the pred in a claim isn't actually eval'd use std; -import std::str::*; import std::uint::*; pure fn fails(a: uint) -> bool { fail; } diff --git a/src/test/run-pass/sio-read.rs b/src/test/run-pass/sio-read.rs index 194c55a15081..9f7272e6d92c 100644 --- a/src/test/run-pass/sio-read.rs +++ b/src/test/run-pass/sio-read.rs @@ -15,7 +15,7 @@ fn connectTask(cx: sio::ctx, ip: net::ip_addr, portnum: int) { fn main() { let cx: sio::ctx = sio::new(); let srv: sio::server = sio::create_server( - cx, net::parse_addr("~0.0.0.0"), 9090); + cx, net::parse_addr(~"0.0.0.0"), 9090); let child = task::_spawn(bind connectTask(cx, net::parse_addr(~"127.0.0.1"), 9090));