about summary refs log tree commit diff
path: root/src/test/stdtest
diff options
context:
space:
mode:
authorGraydon Hoare <graydon@mozilla.com>2011-12-22 17:53:53 -0800
committerGraydon Hoare <graydon@mozilla.com>2011-12-22 17:53:53 -0800
commitf0dfbe7b1b8d630488441982cf3d46f82a3a89db (patch)
tree8e26605c3d3628cd336e566b8ec7391c058c3a1a /src/test/stdtest
parentccb5b6fb259d5de9be751175fc53df1eaea4cd2c (diff)
downloadrust-f0dfbe7b1b8d630488441982cf3d46f82a3a89db.tar.gz
rust-f0dfbe7b1b8d630488441982cf3d46f82a3a89db.zip
Register new snapshots, purge log_err and log_full in favour of log(...).
Diffstat (limited to 'src/test/stdtest')
-rw-r--r--src/test/stdtest/deque.rs20
-rw-r--r--src/test/stdtest/four.rs2
-rw-r--r--src/test/stdtest/fs.rs8
-rw-r--r--src/test/stdtest/getopts.rs2
-rw-r--r--src/test/stdtest/io.rs6
-rw-r--r--src/test/stdtest/os.rs2
-rw-r--r--src/test/stdtest/path.rs6
-rw-r--r--src/test/stdtest/qsort.rs2
-rw-r--r--src/test/stdtest/qsort3.rs2
-rw-r--r--src/test/stdtest/rand.rs38
-rw-r--r--src/test/stdtest/run.rs4
-rw-r--r--src/test/stdtest/sort.rs2
-rw-r--r--src/test/stdtest/str.rs18
-rw-r--r--src/test/stdtest/sys.rs2
-rw-r--r--src/test/stdtest/task.rs6
15 files changed, 60 insertions, 60 deletions
diff --git a/src/test/stdtest/deque.rs b/src/test/stdtest/deque.rs
index f48260f4cce..a94b1739b32 100644
--- a/src/test/stdtest/deque.rs
+++ b/src/test/stdtest/deque.rs
@@ -14,21 +14,21 @@ fn test_simple() {
     assert (d.size() == 3u);
     d.add_back(137);
     assert (d.size() == 4u);
-    log_full(core::debug, d.peek_front());
+    log(debug, d.peek_front());
     assert (d.peek_front() == 42);
-    log_full(core::debug, d.peek_back());
+    log(debug, d.peek_back());
     assert (d.peek_back() == 137);
     let i: int = d.pop_front();
-    log_full(core::debug, i);
+    log(debug, i);
     assert (i == 42);
     i = d.pop_back();
-    log_full(core::debug, i);
+    log(debug, i);
     assert (i == 137);
     i = d.pop_back();
-    log_full(core::debug, i);
+    log(debug, i);
     assert (i == 137);
     i = d.pop_back();
-    log_full(core::debug, i);
+    log(debug, i);
     assert (i == 17);
     assert (d.size() == 0u);
     d.add_back(3);
@@ -39,10 +39,10 @@ fn test_simple() {
     assert (d.size() == 3u);
     d.add_front(1);
     assert (d.size() == 4u);
-    log_full(core::debug, d.get(0));
-    log_full(core::debug, d.get(1));
-    log_full(core::debug, d.get(2));
-    log_full(core::debug, d.get(3));
+    log(debug, d.get(0));
+    log(debug, d.get(1));
+    log(debug, d.get(2));
+    log(debug, d.get(3));
     assert (d.get(0) == 1);
     assert (d.get(1) == 2);
     assert (d.get(2) == 3);
diff --git a/src/test/stdtest/four.rs b/src/test/stdtest/four.rs
index f28edd03e36..0810253c9fd 100644
--- a/src/test/stdtest/four.rs
+++ b/src/test/stdtest/four.rs
@@ -139,7 +139,7 @@ fn test_four_to_tri() {
     assert tri::eq( four::to_trit(four::true), tri::true );
     assert tri::eq( four::to_trit(four::false), tri::false );
     assert tri::eq( four::to_trit(four::none), tri::unknown );
-    log_full(core::debug, four::to_trit(four::both));
+    log(debug, four::to_trit(four::both));
     assert tri::eq( four::to_trit(four::both), tri::unknown );
 }
 
diff --git a/src/test/stdtest/fs.rs b/src/test/stdtest/fs.rs
index fca25f70fa5..a0ab02a898f 100644
--- a/src/test/stdtest/fs.rs
+++ b/src/test/stdtest/fs.rs
@@ -7,7 +7,7 @@ import vec;
 #[test]
 fn test_connect() {
     let slash = fs::path_sep();
-    log_full(core::error, fs::connect("a", "b"));
+    log(error, fs::connect("a", "b"));
     assert (fs::connect("a", "b") == "a" + slash + "b");
     assert (fs::connect("a" + slash, "b") == "a" + slash + "b");
 }
@@ -22,7 +22,7 @@ fn list_dir() {
     // Just assuming that we've got some contents in the current directory
     assert (vec::len(dirs) > 0u);
 
-    for dir in dirs { log_full(core::debug, dir); }
+    for dir in dirs { log(debug, dir); }
 }
 
 #[test]
@@ -140,7 +140,7 @@ fn normalize9() {
 fn normalize10() {
     let actual = fs::normalize("/a/b/c/../d/./../../e/");
     let expected = "/a/e/";
-    log_full(core::error, actual);
+    log(error, actual);
     assert actual == expected;
 }
 
@@ -156,7 +156,7 @@ fn normalize11() {
 fn normalize12() {
    let actual = fs::normalize("C:/whatever");
    let expected = "C:/whatever";
-   log_full(core::error, actual);
+   log(error, actual);
    assert actual == expected;
 }
 
diff --git a/src/test/stdtest/getopts.rs b/src/test/stdtest/getopts.rs
index 5d397f6e702..52b68f888c4 100644
--- a/src/test/stdtest/getopts.rs
+++ b/src/test/stdtest/getopts.rs
@@ -246,7 +246,7 @@ fn test_optflag_long_arg() {
     let rs = opt::getopts(args, opts);
     alt rs {
       err(f) {
-        log_full(core::error, opt::fail_str(f));
+        log(error, opt::fail_str(f));
         check_fail_type(f, unexpected_argument);
       }
       _ { fail; }
diff --git a/src/test/stdtest/io.rs b/src/test/stdtest/io.rs
index 742ec39d828..7e481fabea0 100644
--- a/src/test/stdtest/io.rs
+++ b/src/test/stdtest/io.rs
@@ -9,9 +9,9 @@ import result;
 #[test]
 fn test_simple() {
     let tmpfile: str = "tmp/lib-io-test-simple.tmp";
-    log_full(core::debug, tmpfile);
+    log(debug, tmpfile);
     let frood: str = "A hoopy frood who really knows where his towel is.";
-    log_full(core::debug, frood);
+    log(debug, frood);
     {
         let out: io::writer =
             result::get(io::file_writer(tmpfile, [io::create, io::truncate]));
@@ -19,7 +19,7 @@ fn test_simple() {
     }
     let inp: io::reader = result::get(io::file_reader(tmpfile));
     let frood2: str = inp.read_c_str();
-    log_full(core::debug, frood2);
+    log(debug, frood2);
     assert (str::eq(frood, frood2));
 }
 
diff --git a/src/test/stdtest/os.rs b/src/test/stdtest/os.rs
index 2d1a64da753..7f7b2c4f3b3 100644
--- a/src/test/stdtest/os.rs
+++ b/src/test/stdtest/os.rs
@@ -36,7 +36,7 @@ fn get_exe_path() {
     let path = std::os::get_exe_path();
     assert option::is_some(path);
     let path = option::get(path);
-    log_full(core::debug, path);
+    log(debug, path);
 
     // Hard to test this function
     if std::os::target_os() != "win32" {
diff --git a/src/test/stdtest/path.rs b/src/test/stdtest/path.rs
index bb07fae6899..e711288c615 100644
--- a/src/test/stdtest/path.rs
+++ b/src/test/stdtest/path.rs
@@ -11,8 +11,8 @@ import std::os;
 fn test() {
     assert (!fs::path_is_absolute("test-path"));
 
-    log_full(core::debug, "Current working directory: " + os::getcwd());
+    log(debug, "Current working directory: " + os::getcwd());
 
-    log_full(core::debug, fs::make_absolute("test-path"));
-    log_full(core::debug, fs::make_absolute("/usr/bin"));
+    log(debug, fs::make_absolute("test-path"));
+    log(debug, fs::make_absolute("/usr/bin"));
 }
diff --git a/src/test/stdtest/qsort.rs b/src/test/stdtest/qsort.rs
index cac57233ea1..67e16942e41 100644
--- a/src/test/stdtest/qsort.rs
+++ b/src/test/stdtest/qsort.rs
@@ -13,7 +13,7 @@ fn check_sort(v1: [mutable int], v2: [mutable int]) {
     std::sort::quick_sort::<int>(f, v1);
     let i = 0u;
     while i < len {
-        log_full(core::debug, v2[i]);
+        log(debug, v2[i]);
         assert (v2[i] == v1[i]);
         i += 1u;
     }
diff --git a/src/test/stdtest/qsort3.rs b/src/test/stdtest/qsort3.rs
index 50f7bd27427..b4371b2c3b4 100644
--- a/src/test/stdtest/qsort3.rs
+++ b/src/test/stdtest/qsort3.rs
@@ -11,7 +11,7 @@ fn check_sort(v1: [mutable int], v2: [mutable int]) {
     std::sort::quick_sort3::<int>(f1, f2, v1);
     let i = 0u;
     while i < len {
-        log_full(core::debug, v2[i]);
+        log(debug, v2[i]);
         assert (v2[i] == v1[i]);
         i += 1u;
     }
diff --git a/src/test/stdtest/rand.rs b/src/test/stdtest/rand.rs
index e59134830d2..1460fb87f80 100644
--- a/src/test/stdtest/rand.rs
+++ b/src/test/stdtest/rand.rs
@@ -8,33 +8,33 @@ import str;
 #[test]
 fn test() {
     let r1: rand::rng = rand::mk_rng();
-    log_full(core::debug, r1.next());
-    log_full(core::debug, r1.next());
+    log(debug, r1.next());
+    log(debug, r1.next());
     {
         let r2 = rand::mk_rng();
-        log_full(core::debug, r1.next());
-        log_full(core::debug, r2.next());
-        log_full(core::debug, r1.next());
-        log_full(core::debug, r1.next());
-        log_full(core::debug, r2.next());
-        log_full(core::debug, r2.next());
-        log_full(core::debug, r1.next());
-        log_full(core::debug, r1.next());
-        log_full(core::debug, r1.next());
-        log_full(core::debug, r2.next());
-        log_full(core::debug, r2.next());
-        log_full(core::debug, r2.next());
+        log(debug, r1.next());
+        log(debug, r2.next());
+        log(debug, r1.next());
+        log(debug, r1.next());
+        log(debug, r2.next());
+        log(debug, r2.next());
+        log(debug, r1.next());
+        log(debug, r1.next());
+        log(debug, r1.next());
+        log(debug, r2.next());
+        log(debug, r2.next());
+        log(debug, r2.next());
     }
-    log_full(core::debug, r1.next());
-    log_full(core::debug, r1.next());
+    log(debug, r1.next());
+    log(debug, r1.next());
 }
 
 #[test]
 fn genstr() {
     let r: rand::rng = rand::mk_rng();
-    log_full(core::debug, r.gen_str(10u));
-    log_full(core::debug, r.gen_str(10u));
-    log_full(core::debug, r.gen_str(10u));
+    log(debug, r.gen_str(10u));
+    log(debug, r.gen_str(10u));
+    log(debug, r.gen_str(10u));
     assert(str::char_len(r.gen_str(10u)) == 10u);
     assert(str::char_len(r.gen_str(16u)) == 16u);
 }
diff --git a/src/test/stdtest/run.rs b/src/test/stdtest/run.rs
index e0d68d21756..fae791c3d9c 100644
--- a/src/test/stdtest/run.rs
+++ b/src/test/stdtest/run.rs
@@ -35,8 +35,8 @@ fn test_pipes() {
     readclose(pipe_err.in);
     os::waitpid(pid);
 
-    log_full(core::debug, expected);
-    log_full(core::debug, actual);
+    log(debug, expected);
+    log(debug, actual);
     assert (expected == actual);
 
     fn writeclose(fd: fd_t, s: str) {
diff --git a/src/test/stdtest/sort.rs b/src/test/stdtest/sort.rs
index 9a8f4686920..83d885797bf 100644
--- a/src/test/stdtest/sort.rs
+++ b/src/test/stdtest/sort.rs
@@ -9,7 +9,7 @@ fn check_sort(v1: [int], v2: [int]) {
     let v3 = std::sort::merge_sort::<int>(f, v1);
     let i = 0u;
     while i < len {
-        log_full(core::debug, v3[i]);
+        log(debug, v3[i]);
         assert (v3[i] == v2[i]);
         i += 1u;
     }
diff --git a/src/test/stdtest/str.rs b/src/test/stdtest/str.rs
index 0e819bac4c8..c3f0e53bac5 100644
--- a/src/test/stdtest/str.rs
+++ b/src/test/stdtest/str.rs
@@ -42,10 +42,10 @@ fn test_index_and_rindex() {
 #[test]
 fn test_split() {
     fn t(s: str, c: char, u: [str]) {
-        log_full(core::debug, "split: " + s);
+        log(debug, "split: " + s);
         let v = str::split(s, c as u8);
         #debug("split to: ");
-        log_full(core::debug, v);
+        log(debug, v);
         assert (vec::all2(v, u, { |a,b| a == b }));
     }
     t("abc.hello.there", '.', ["abc", "hello", "there"]);
@@ -56,12 +56,12 @@ fn test_split() {
 #[test]
 fn test_splitn() {
     fn t(s: str, c: char, n: uint, u: [str]) {
-        log_full(core::debug, "splitn: " + s);
+        log(debug, "splitn: " + s);
         let v = str::splitn(s, c as u8, n);
         #debug("split to: ");
-        log_full(core::debug, v);
+        log(debug, v);
         #debug("comparing vs. ");
-        log_full(core::debug, u);
+        log(debug, u);
         assert (vec::all2(v, u, { |a,b| a == b }));
     }
     t("abc.hello.there", '.', 0u, ["abc.hello.there"]);
@@ -92,8 +92,8 @@ fn test_split_str() {
 fn test_find() {
     fn t(haystack: str, needle: str, i: int) {
         let j: int = str::find(haystack, needle);
-        log_full(core::debug, "searched for " + needle);
-        log_full(core::debug, j);
+        log(debug, "searched for " + needle);
+        log(debug, j);
         assert (i == j);
     }
     t("this is a simple", "is a", 5);
@@ -329,8 +329,8 @@ fn vec_str_conversions() {
     while i < n1 {
         let a: u8 = s1[i];
         let b: u8 = s2[i];
-        log_full(core::debug, a);
-        log_full(core::debug, b);
+        log(debug, a);
+        log(debug, b);
         assert (a == b);
         i += 1u;
     }
diff --git a/src/test/stdtest/sys.rs b/src/test/stdtest/sys.rs
index 8a47d9c3039..632f42c0f6b 100644
--- a/src/test/stdtest/sys.rs
+++ b/src/test/stdtest/sys.rs
@@ -4,7 +4,7 @@ import sys;
 
 #[test]
 fn last_os_error() {
-    log_full(core::debug, sys::last_os_error());
+    log(debug, sys::last_os_error());
 }
 
 #[test]
diff --git a/src/test/stdtest/task.rs b/src/test/stdtest/task.rs
index 1059f9084e3..31299e703be 100644
--- a/src/test/stdtest/task.rs
+++ b/src/test/stdtest/task.rs
@@ -35,7 +35,7 @@ fn test_join_chan() {
     task::spawn_notify((), winner, comm::chan(p));
     let s = comm::recv(p);
     #error("received task status message");
-    log_full(core::error, s);
+    log(error, s);
     alt s {
       task::exit(_, task::tr_success.) {/* yay! */ }
       _ { fail "invalid task status received" }
@@ -52,7 +52,7 @@ fn test_join_chan_fail() {
     task::spawn_notify((), failer, comm::chan(p));
     let s = comm::recv(p);
     #error("received task status message");
-    log_full(core::error, s);
+    log(error, s);
     alt s {
       task::exit(_, task::tr_failure.) {/* yay! */ }
       _ { fail "invalid task status received" }
@@ -70,7 +70,7 @@ fn test_join_convenient() {
 #[ignore]
 fn spawn_polymorphic() {
     // FIXME #1038: Can't spawn palymorphic functions
-    /*fn foo<send T>(x: T) { log_full(core::error, x); }
+    /*fn foo<send T>(x: T) { log(error, x); }
 
     task::spawn(true, foo);
     task::spawn(42, foo);*/