diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2012-03-12 20:04:27 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2012-03-12 20:08:29 -0700 |
| commit | 6f5853f5a1767e0c418fd5f348a795b76d701b3e (patch) | |
| tree | 7d054b8471a75c47854edbd52a14d8d2acf81c9d /src/rustc/syntax | |
| parent | ac57bb38560fa35d883505af2e8e68498b436fe7 (diff) | |
Libc/os/run/rand/io reorganization. Close #1373. Close #1638.
- Move io, run and rand to core. - Remove incorrect ctypes module (use libc). - Remove os-specific modules for os and fs. - Split fs between core::path and core::os.
Diffstat (limited to 'src/rustc/syntax')
| -rw-r--r-- | src/rustc/syntax/ext/env.rs | 3 | ||||
| -rw-r--r-- | src/rustc/syntax/ext/log_syntax.rs | 4 | ||||
| -rw-r--r-- | src/rustc/syntax/ext/qquote.rs | 4 | ||||
| -rw-r--r-- | src/rustc/syntax/parse/eval.rs | 12 | ||||
| -rw-r--r-- | src/rustc/syntax/parse/lexer.rs | 2 | ||||
| -rw-r--r-- | src/rustc/syntax/parse/parser.rs | 5 | ||||
| -rw-r--r-- | src/rustc/syntax/print/pp.rs | 2 | ||||
| -rw-r--r-- | src/rustc/syntax/print/pprust.rs | 2 |
8 files changed, 12 insertions, 22 deletions
diff --git a/src/rustc/syntax/ext/env.rs b/src/rustc/syntax/ext/env.rs index cb9453ae062..c4ef1abc3e6 100644 --- a/src/rustc/syntax/ext/env.rs +++ b/src/rustc/syntax/ext/env.rs @@ -4,7 +4,6 @@ * should all get sucked into either the compiler syntax extension plugin * interface. */ -import std::generic_os; import base::*; export expand_syntax_ext; @@ -25,7 +24,7 @@ fn expand_syntax_ext(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg, // option<str> rather than just an maybe-empty string. let var = expr_to_str(cx, args[0], "#env requires a string"); - alt generic_os::getenv(var) { + alt os::getenv(var) { option::none { ret make_new_str(cx, sp, ""); } option::some(s) { ret make_new_str(cx, sp, s); } } diff --git a/src/rustc/syntax/ext/log_syntax.rs b/src/rustc/syntax/ext/log_syntax.rs index 911cf9ff2eb..23364adb744 100644 --- a/src/rustc/syntax/ext/log_syntax.rs +++ b/src/rustc/syntax/ext/log_syntax.rs @@ -1,12 +1,12 @@ import base::*; import syntax::ast; -import std::io::writer_util; +import io::writer_util; fn expand_syntax_ext(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg, _body: ast::mac_body) -> @ast::expr { let arg = get_mac_arg(cx,sp,arg); cx.print_backtrace(); - std::io::stdout().write_line(print::pprust::expr_to_str(arg)); + io::stdout().write_line(print::pprust::expr_to_str(arg)); //trivial expression ret @{id: cx.next_id(), node: ast::expr_rec([], option::none), span: sp}; diff --git a/src/rustc/syntax/ext/qquote.rs b/src/rustc/syntax/ext/qquote.rs index 7f7d5a387f0..afcae2ff690 100644 --- a/src/rustc/syntax/ext/qquote.rs +++ b/src/rustc/syntax/ext/qquote.rs @@ -10,7 +10,7 @@ import syntax::parse::parser; import syntax::parse::parser::{parser, parse_from_source_str}; import syntax::print::*; -import std::io::*; +import io::*; import codemap::span; @@ -318,7 +318,7 @@ fn replace_ty(repls: [fragment], } fn print_expr(expr: @ast::expr) { - let stdout = std::io::stdout(); + let stdout = io::stdout(); let pp = pprust::rust_printer(stdout); pprust::print_expr(pp, expr); pp::eof(pp.s); diff --git a/src/rustc/syntax/parse/eval.rs b/src/rustc/syntax/parse/eval.rs index 06f26905550..57a91f4a32e 100644 --- a/src/rustc/syntax/parse/eval.rs +++ b/src/rustc/syntax/parse/eval.rs @@ -1,6 +1,4 @@ - import front::attr; -import std::{io, fs}; import syntax::ast; import syntax::parse::token; import syntax::parse::parser::{parser, new_parser_from_file, @@ -53,7 +51,7 @@ fn parse_companion_mod(cx: ctx, prefix: str, suffix: option<str>) fn companion_file(prefix: str, suffix: option<str>) -> str { ret alt suffix { - option::some(s) { fs::connect(prefix, s) } + option::some(s) { path::connect(prefix, s) } option::none { prefix } } + ".rs"; } @@ -100,9 +98,9 @@ fn eval_crate_directive(cx: ctx, cdir: @ast::crate_directive, prefix: str, ast::cdir_src_mod(id, attrs) { let file_path = cdir_path_opt(id + ".rs", attrs); let full_path = - if std::fs::path_is_absolute(file_path) { + if path::path_is_absolute(file_path) { file_path - } else { prefix + std::fs::path_sep() + file_path }; + } else { prefix + path::path_sep() + file_path }; let p0 = new_parser_from_file(cx.sess, cx.cfg, full_path, SOURCE_FILE); let inner_attrs = parse_inner_attrs_and_next(p0); @@ -121,9 +119,9 @@ fn eval_crate_directive(cx: ctx, cdir: @ast::crate_directive, prefix: str, ast::cdir_dir_mod(id, cdirs, attrs) { let path = cdir_path_opt(id, attrs); let full_path = - if std::fs::path_is_absolute(path) { + if path::path_is_absolute(path) { path - } else { prefix + std::fs::path_sep() + path }; + } else { prefix + path::path_sep() + path }; let (m0, a0) = eval_crate_directives_to_mod( cx, cdirs, full_path, none); let i = diff --git a/src/rustc/syntax/parse/lexer.rs b/src/rustc/syntax/parse/lexer.rs index 076706b396b..b1fbf1bf7a4 100644 --- a/src/rustc/syntax/parse/lexer.rs +++ b/src/rustc/syntax/parse/lexer.rs @@ -1,5 +1,3 @@ - -import std::io; import io::reader_util; import util::interner; import util::interner::intern; diff --git a/src/rustc/syntax/parse/parser.rs b/src/rustc/syntax/parse/parser.rs index 1e60ef1fb8a..6fd61bc9db4 100644 --- a/src/rustc/syntax/parse/parser.rs +++ b/src/rustc/syntax/parse/parser.rs @@ -1,4 +1,3 @@ -import std::{io, fs}; import either::{left, right}; import std::map::{hashmap, new_str_hash}; import token::can_begin_expr; @@ -2771,7 +2770,7 @@ fn parse_crate_from_crate_file(input: str, cfg: ast::crate_cfg, sess: parse_sess) -> @ast::crate { let p = new_parser_from_file(sess, cfg, input, CRATE_FILE); let lo = p.span.lo; - let prefix = std::fs::dirname(p.reader.filemap.name); + let prefix = path::dirname(p.reader.filemap.name); let leading_attrs = parse_inner_attrs_and_next(p); let crate_attrs = leading_attrs.inner; let first_cdir_attr = leading_attrs.next; @@ -2782,7 +2781,7 @@ fn parse_crate_from_crate_file(input: str, cfg: ast::crate_cfg, @{p: p, sess: sess, cfg: p.cfg}; - let (companionmod, _) = fs::splitext(fs::basename(input)); + let (companionmod, _) = path::splitext(path::basename(input)); let (m, attrs) = eval::eval_crate_directives_to_mod( cx, cdirs, prefix, option::some(companionmod)); let hi = p.span.hi; diff --git a/src/rustc/syntax/print/pp.rs b/src/rustc/syntax/print/pp.rs index 0b55bb8c356..e5d295e1a60 100644 --- a/src/rustc/syntax/print/pp.rs +++ b/src/rustc/syntax/print/pp.rs @@ -1,5 +1,3 @@ - -import std::io; import io::writer_util; /* diff --git a/src/rustc/syntax/print/pprust.rs b/src/rustc/syntax/print/pprust.rs index b02b374e527..ec592cda700 100644 --- a/src/rustc/syntax/print/pprust.rs +++ b/src/rustc/syntax/print/pprust.rs @@ -1,5 +1,3 @@ - -import std::io; import parse::lexer; import syntax::codemap::codemap; import pp::{break_offset, word, printer, |
