about summary refs log tree commit diff
path: root/src/rustc/syntax/parse
diff options
context:
space:
mode:
authorGraydon Hoare <graydon@mozilla.com>2012-03-12 20:04:27 -0700
committerGraydon Hoare <graydon@mozilla.com>2012-03-12 20:08:29 -0700
commit6f5853f5a1767e0c418fd5f348a795b76d701b3e (patch)
tree7d054b8471a75c47854edbd52a14d8d2acf81c9d /src/rustc/syntax/parse
parentac57bb38560fa35d883505af2e8e68498b436fe7 (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/parse')
-rw-r--r--src/rustc/syntax/parse/eval.rs12
-rw-r--r--src/rustc/syntax/parse/lexer.rs2
-rw-r--r--src/rustc/syntax/parse/parser.rs5
3 files changed, 7 insertions, 12 deletions
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;