diff options
| author | Brian Anderson <[email protected]> | 2011-02-22 18:58:07 -0500 |
|---|---|---|
| committer | Brian Anderson <[email protected]> | 2011-02-22 21:52:23 -0500 |
| commit | c4df39609c9c09c450dd8fe5905a8e6fbeb5f181 (patch) | |
| tree | 1dc8fb985c2b6e406df0c2a1f9ff15963b8c87fc | |
| parent | rustc: Perform explicit type substitution as requested by the programmer (diff) | |
| download | rust-c4df39609c9c09c450dd8fe5905a8e6fbeb5f181.tar.xz rust-c4df39609c9c09c450dd8fe5905a8e6fbeb5f181.zip | |
Rename std._io to std.io since 'io' is no longer a keyword
| -rw-r--r-- | src/comp/front/lexer.rs | 2 | ||||
| -rw-r--r-- | src/comp/front/parser.rs | 4 | ||||
| -rw-r--r-- | src/lib/io.rs (renamed from src/lib/_io.rs) | 0 | ||||
| -rw-r--r-- | src/lib/std.rc | 4 | ||||
| -rw-r--r-- | src/test/run-pass/lib-io.rs | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/comp/front/lexer.rs b/src/comp/front/lexer.rs index a45b1113..481fc5dd 100644 --- a/src/comp/front/lexer.rs +++ b/src/comp/front/lexer.rs @@ -1,4 +1,4 @@ -import std._io.stdio_reader; +import std.io.stdio_reader; import std._str; import std.map; import std.map.hashmap; diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs index 71b06b45..bbac78d3 100644 --- a/src/comp/front/parser.rs +++ b/src/comp/front/parser.rs @@ -1,4 +1,4 @@ -import std._io; +import std.io; import std._vec; import std._str; import std.option; @@ -80,7 +80,7 @@ impure fn new_parser(session.session sess, ret tup(crate, def); } } - auto srdr = _io.new_stdio_reader(path); + auto srdr = io.new_stdio_reader(path); auto rdr = lexer.new_reader(srdr, path); auto npos = rdr.get_curr_pos(); ret stdio_parser(sess, lexer.next_token(rdr), diff --git a/src/lib/_io.rs b/src/lib/io.rs index f285f6c8..f285f6c8 100644 --- a/src/lib/_io.rs +++ b/src/lib/io.rs diff --git a/src/lib/std.rc b/src/lib/std.rc index 3500c4b3..4ad422a3 100644 --- a/src/lib/std.rc +++ b/src/lib/std.rc @@ -14,7 +14,7 @@ mod _str; // General IO and system-services modules. -mod _io; +mod io; mod sys; mod _task; @@ -25,7 +25,7 @@ mod util; // Authorize various rule-bendings. -auth _io = unsafe; +auth io = unsafe; auth _str = unsafe; auth _vec = unsafe; auth _task = unsafe; diff --git a/src/test/run-pass/lib-io.rs b/src/test/run-pass/lib-io.rs index 66394435..e0665fb6 100644 --- a/src/test/run-pass/lib-io.rs +++ b/src/test/run-pass/lib-io.rs @@ -1,7 +1,7 @@ // -*- rust -*- use std; -import std._io; +import std.io; import std._str; fn test_simple(str tmpfilebase) { @@ -11,11 +11,11 @@ fn test_simple(str tmpfilebase) { log frood; { - let _io.buf_writer out = _io.new_buf_writer(tmpfile, vec(_io.create())); + let io.buf_writer out = io.new_buf_writer(tmpfile, vec(io.create())); out.write(_str.bytes(frood)); } - let _io.buf_reader inp = _io.new_buf_reader(tmpfile); + let io.buf_reader inp = io.new_buf_reader(tmpfile); let str frood2 = _str.from_bytes(inp.read()); log frood2; check (_str.eq(frood, frood2)); |