diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-08-11 22:54:12 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-08-12 12:14:06 -0700 |
| commit | 495b0bf65ed6c2a8f3d9ab4aaa8c187bb144051e (patch) | |
| tree | bd1f059b4972b61e08bb6993614b5be71291e5a1 /src/lib | |
| parent | 7625ed52eee77078747f9e9639b89166681abef8 (diff) | |
Remove std::term
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/std.rc | 1 | ||||
| -rw-r--r-- | src/lib/term.rs | 81 | ||||
| -rw-r--r-- | src/lib/test.rs | 14 |
3 files changed, 7 insertions, 89 deletions
diff --git a/src/lib/std.rc b/src/lib/std.rc index eee4630db20..847ca6e6b6d 100644 --- a/src/lib/std.rc +++ b/src/lib/std.rc @@ -87,7 +87,6 @@ mod ufindivec; mod extfmt; mod box; mod getopts; -mod term; mod time; mod smallintmap; mod ptr; diff --git a/src/lib/term.rs b/src/lib/term.rs deleted file mode 100644 index f61611a9a15..00000000000 --- a/src/lib/term.rs +++ /dev/null @@ -1,81 +0,0 @@ - - - -// Simple ANSI color library. -// -// TODO: Windows support. -const color_black: u8 = 0u8; - -const color_red: u8 = 1u8; - -const color_green: u8 = 2u8; - -const color_yellow: u8 = 3u8; - -const color_blue: u8 = 4u8; - -const color_magenta: u8 = 5u8; - -const color_cyan: u8 = 6u8; - -const color_light_gray: u8 = 7u8; - -const color_light_grey: u8 = 7u8; - -const color_dark_gray: u8 = 8u8; - -const color_dark_grey: u8 = 8u8; - -const color_bright_red: u8 = 9u8; - -const color_bright_green: u8 = 10u8; - -const color_bright_yellow: u8 = 11u8; - -const color_bright_blue: u8 = 12u8; - -const color_bright_magenta: u8 = 13u8; - -const color_bright_cyan: u8 = 14u8; - -const color_bright_white: u8 = 15u8; - -fn esc(writer: io::buf_writer) { writer.write(~[0x1bu8, '[' as u8]); } - -fn reset(writer: io::buf_writer) { - esc(writer); - writer.write(~['0' as u8, 'm' as u8]); -} - -fn color_supported() -> bool { - let supported_terms = ["xterm-color", "xterm", "screen-bce"]; - ret alt generic_os::getenv("TERM") { - option::some(env) { vec::member(env, supported_terms) } - option::none. { false } - }; -} - -fn set_color(writer: io::buf_writer, first_char: u8, color: u8) { - assert (color < 16u8); - esc(writer); - if color >= 8u8 { writer.write(~['1' as u8, ';' as u8]); color -= 8u8; } - writer.write(~[first_char, ('0' as u8) + color, 'm' as u8]); -} - -fn fg(writer: io::buf_writer, color: u8) { - ret set_color(writer, '3' as u8, color); -} - -fn bg(writer: io::buf_writer, color: u8) { - ret set_color(writer, '4' as u8, color); -} -// export fg; -// export bg; - -// Local Variables: -// fill-column: 78; -// indent-tabs-mode: nil -// c-basic-offset: 4 -// buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; -// End: diff --git a/src/lib/test.rs b/src/lib/test.rs index de6a4555cf1..eeaf472c865 100644 --- a/src/lib/test.rs +++ b/src/lib/test.rs @@ -181,25 +181,25 @@ fn run_tests_console_(opts: &test_opts, tests: &[test_desc], ret success; fn write_ok(out: &io::writer, use_color: bool) { - write_pretty(out, "ok", term::color_green, use_color); + write_pretty(out, "ok", termivec::color_green, use_color); } fn write_failed(out: &io::writer, use_color: bool) { - write_pretty(out, "FAILED", term::color_red, use_color); + write_pretty(out, "FAILED", termivec::color_red, use_color); } fn write_ignored(out: &io::writer, use_color: bool) { - write_pretty(out, "ignored", term::color_yellow, use_color); + write_pretty(out, "ignored", termivec::color_yellow, use_color); } fn write_pretty(out: &io::writer, word: &str, color: u8, use_color: bool) { - if use_color && term::color_supported() { - term::fg(out.get_buf_writer(), color); + if use_color && termivec::color_supported() { + termivec::fg(out.get_buf_writer(), color); } out.write_str(word); - if use_color && term::color_supported() { - term::reset(out.get_buf_writer()); + if use_color && termivec::color_supported() { + termivec::reset(out.get_buf_writer()); } } } |
