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.

6 files changed, 15 insertions, 27 deletions

diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index e0780bf473c..09ab34a9ade 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -4,7 +4,6 @@
 import option;
 import std::getopts;
 import std::test;
-import std::fs;
 import str;
 import vec;
 import task;
@@ -131,7 +130,7 @@ fn test_opts(config: config) -> test::test_opts {
 fn make_tests(config: config) -> [test::test_desc] {
     #debug("making tests from %s", config.src_base);
     let tests = [];
-    for file: str in fs::list_dir(config.src_base) {
+    for file: str in os::list_dir(config.src_base) {
         let file = file;
         #debug("inspecting file %s", file);
         if is_test(config, file) {
@@ -146,7 +145,7 @@ fn is_test(config: config, testfile: str) -> bool {
     let valid_extensions =
         alt config.mode { mode_pretty { [".rs"] } _ { [".rc", ".rs"] } };
     let invalid_prefixes = [".", "#", "~"];
-    let name = fs::basename(testfile);
+    let name = path::basename(testfile);
 
     let valid = false;
 
diff --git a/src/compiletest/errors.rs b/src/compiletest/errors.rs
index 1fedd785750..f8487ad44cf 100644
--- a/src/compiletest/errors.rs
+++ b/src/compiletest/errors.rs
@@ -1,6 +1,4 @@
-import std::io;
 import io::reader_util;
-import std::fs;
 
 import common::config;
 
diff --git a/src/compiletest/header.rs b/src/compiletest/header.rs
index e0a37cd9414..654c49b2dee 100644
--- a/src/compiletest/header.rs
+++ b/src/compiletest/header.rs
@@ -1,8 +1,6 @@
 import option;
 import str;
-import std::io;
 import io::reader_util;
-import std::fs;
 
 import common::config;
 
@@ -67,7 +65,7 @@ fn is_test_ignored(config: config, testfile: str) -> bool {
     ret found;
 
     fn xfail_target() -> str {
-        "xfail-" + std::os::target_os()
+        "xfail-" + os::sysname()
     }
 }
 
@@ -103,7 +101,7 @@ fn parse_pp_exact(line: str, testfile: str) -> option<str> {
       option::some(s) { option::some(s) }
       option::none {
         if parse_name_directive(line, "pp-exact") {
-            option::some(fs::basename(testfile))
+            option::some(path::basename(testfile))
         } else {
             option::none
         }
diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs
index abdd0fb9ab0..f382839d4a6 100644
--- a/src/compiletest/procsrv.rs
+++ b/src/compiletest/procsrv.rs
@@ -1,16 +1,13 @@
-import std::run;
-import std::run::spawn_process;
-import std::io;
-import std::os;
+import run::spawn_process;
 import io::writer_util;
-import ctypes::{pid_t, fd_t};
+import libc::{c_int, pid_t};
 
 export run;
 
 #[cfg(target_os = "win32")]
 fn target_env(lib_path: str, prog: str) -> option<[(str,str)]> {
 
-    let env = std::generic_os::env();
+    let env = os::env();
 
     env = vec::map(env) {|pair|
         let (k,v) = pair;
@@ -81,7 +78,7 @@ fn run(lib_path: str, prog: str, args: [str],
     ret {status: status, out: outs, err: errs};
 }
 
-fn writeclose(fd: fd_t, s: option<str>) {
+fn writeclose(fd: c_int, s: option<str>) {
     if option::is_some(s) {
         let writer = io::fd_writer(fd, false);
         writer.write_str(option::get(s));
@@ -90,9 +87,9 @@ fn writeclose(fd: fd_t, s: option<str>) {
     os::close(fd);
 }
 
-fn readclose(fd: fd_t) -> str {
+fn readclose(fd: c_int) -> str {
     // Copied from run::program_output
-    let file = os::fd_FILE(fd);
+    let file = os::fdopen(fd);
     let reader = io::FILE_reader(file, false);
     let buf = "";
     while !reader.eof() {
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index 75855b63c8d..92316e9a2b0 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -1,7 +1,4 @@
-import std::io;
 import io::writer_util;
-import std::fs;
-import std::os;
 
 import common::mode_run_pass;
 import common::mode_run_fail;
@@ -115,7 +112,7 @@ fn run_pretty_test(config: config, props: test_props, testfile: str) {
     let expected =
         alt props.pp_exact {
           option::some(file) {
-            let filepath = fs::connect(fs::dirname(testfile), file);
+            let filepath = path::connect(path::dirname(testfile), file);
             result::get(io::read_whole_file_str(filepath))
           }
           option::none { srcs[vec::len(srcs) - 2u] }
@@ -289,7 +286,7 @@ type procres = {status: int, stdout: str, stderr: str, cmdline: str};
 fn compile_test(config: config, props: test_props,
                 testfile: str) -> procres {
     vec::iter(props.aux_builds) {|rel_ab|
-        let abs_ab = fs::connect(config.aux_base, rel_ab);
+        let abs_ab = path::connect(config.aux_base, rel_ab);
         let auxres = compose_and_run(config, abs_ab,
                                      make_compile_args(_, props, ["--lib"],
                                                        make_lib_name, _),
@@ -338,7 +335,7 @@ fn make_lib_name(config: config, testfile: str) -> str {
 }
 
 fn make_exe_name(config: config, testfile: str) -> str {
-    output_base_name(config, testfile) + os::exec_suffix()
+    output_base_name(config, testfile) + os::exe_suffix()
 }
 
 fn make_run_args(config: config, _props: test_props, testfile: str) ->
@@ -434,7 +431,7 @@ fn make_out_name(config: config, testfile: str, extension: str) -> str {
 fn output_base_name(config: config, testfile: str) -> str {
     let base = config.build_base;
     let filename = {
-        let parts = str::split_char(fs::basename(testfile), '.');
+        let parts = str::split_char(path::basename(testfile), '.');
         str::connect(vec::slice(parts, 0u, vec::len(parts) - 1u), ".")
     };
     #fmt["%s%s.%s", base, filename, config.stage_id]
diff --git a/src/compiletest/util.rs b/src/compiletest/util.rs
index c18dad3b22a..b29b0d968c4 100644
--- a/src/compiletest/util.rs
+++ b/src/compiletest/util.rs
@@ -1,6 +1,5 @@
 import option;
-import std::generic_os::getenv;
-import std::io;
+import os::getenv;
 
 import common::config;