diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-01-08 19:29:16 -0800 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-01-08 19:29:16 -0800 |
| commit | 44ab00ee37c4ffb8440ff20fd8a15cd24a6f3e46 (patch) | |
| tree | 83f3d67a9e21c6ce1b99c2ce8f6a737896c673db /src/libcore/run.rs | |
| parent | a8d37af2473da79be704c9ce2374f278c47177b6 (diff) | |
| download | rust-44ab00ee37c4ffb8440ff20fd8a15cd24a6f3e46.tar.gz rust-44ab00ee37c4ffb8440ff20fd8a15cd24a6f3e46.zip | |
Revert "librustc: Make unqualified identifier searches terminate at the nearest module scope. r=tjc"
This reverts commit a8d37af2473da79be704c9ce2374f278c47177b6.
Diffstat (limited to 'src/libcore/run.rs')
| -rw-r--r-- | src/libcore/run.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libcore/run.rs b/src/libcore/run.rs index 60fe54109d0..b753c647627 100644 --- a/src/libcore/run.rs +++ b/src/libcore/run.rs @@ -20,7 +20,6 @@ use libc::{pid_t, c_void, c_int}; use oldcomm; use option::{Some, None}; use os; -use prelude::*; use ptr; use run; use str; @@ -350,7 +349,7 @@ pub fn program_output(prog: &str, args: &[~str]) -> return {status: status, out: move outs, err: move errs}; } -pub fn writeclose(fd: c_int, s: ~str) { +fn writeclose(fd: c_int, s: ~str) { use io::WriterUtil; error!("writeclose %d, %s", fd as int, s); @@ -360,7 +359,7 @@ pub fn writeclose(fd: c_int, s: ~str) { os::close(fd); } -pub fn readclose(fd: c_int) -> ~str { +fn readclose(fd: c_int) -> ~str { let file = os::fdopen(fd); let reader = io::FILE_reader(file, false); let buf = io::with_bytes_writer(|writer| { @@ -418,11 +417,8 @@ pub fn waitpid(pid: pid_t) -> int { #[cfg(test)] mod tests { - use debug; use io::WriterUtil; - use option::{None, Some}; use os; - use run::{readclose, writeclose}; use run; // Regression test for memory leaks |
