diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2011-12-22 17:53:53 -0800 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2011-12-22 17:53:53 -0800 |
| commit | f0dfbe7b1b8d630488441982cf3d46f82a3a89db (patch) | |
| tree | 8e26605c3d3628cd336e566b8ec7391c058c3a1a /src/test/compile-fail | |
| parent | ccb5b6fb259d5de9be751175fc53df1eaea4cd2c (diff) | |
| download | rust-f0dfbe7b1b8d630488441982cf3d46f82a3a89db.tar.gz rust-f0dfbe7b1b8d630488441982cf3d46f82a3a89db.zip | |
Register new snapshots, purge log_err and log_full in favour of log(...).
Diffstat (limited to 'src/test/compile-fail')
60 files changed, 82 insertions, 82 deletions
diff --git a/src/test/compile-fail/alt-join.rs b/src/test/compile-fail/alt-join.rs index a950cc117e3..0845b33eacf 100644 --- a/src/test/compile-fail/alt-join.rs +++ b/src/test/compile-fail/alt-join.rs @@ -7,6 +7,6 @@ fn my_fail() -> ! { fail; } fn main() { alt true { false { my_fail(); } true { } } - log_full(core::debug, x); + log(debug, x); let x: int; } diff --git a/src/test/compile-fail/and-init.rs b/src/test/compile-fail/and-init.rs index 6b966f4964d..b0b4c0da5e3 100644 --- a/src/test/compile-fail/and-init.rs +++ b/src/test/compile-fail/and-init.rs @@ -3,6 +3,6 @@ fn main() { let i: int; - log_full(core::debug, false && { i = 5; true }); - log_full(core::debug, i); + log(debug, false && { i = 5; true }); + log(debug, i); } diff --git a/src/test/compile-fail/anon-obj-overriding-wrong-type.rs b/src/test/compile-fail/anon-obj-overriding-wrong-type.rs index eeeae1793b7..764cb7bdb41 100644 --- a/src/test/compile-fail/anon-obj-overriding-wrong-type.rs +++ b/src/test/compile-fail/anon-obj-overriding-wrong-type.rs @@ -18,5 +18,5 @@ fn main() { my_a }; - log_full(core::error, my_b.foo()); + log(error, my_b.foo()); } diff --git a/src/test/compile-fail/autoderef-full-lval.rs b/src/test/compile-fail/autoderef-full-lval.rs index 16c83c56a9e..112066d1dea 100644 --- a/src/test/compile-fail/autoderef-full-lval.rs +++ b/src/test/compile-fail/autoderef-full-lval.rs @@ -7,11 +7,11 @@ fn main() { let a: clam = {x: @1, y: @2}; let b: clam = {x: @10, y: @20}; let z: int = a.x + b.y; - log_full(core::debug, z); + log(debug, z); assert (z == 21); let forty: fish = {a: @40}; let two: fish = {a: @2}; let answer: int = forty.a + two.a; - log_full(core::debug, answer); + log(debug, answer); assert (answer == 42); } diff --git a/src/test/compile-fail/bad-bang-ann-2.rs b/src/test/compile-fail/bad-bang-ann-2.rs index 375eadac779..8fb6a9e8737 100644 --- a/src/test/compile-fail/bad-bang-ann-2.rs +++ b/src/test/compile-fail/bad-bang-ann-2.rs @@ -2,6 +2,6 @@ // Tests that a function with a ! annotation always actually fails // error-pattern: some control paths may return -fn bad_bang(i: uint) -> ! { log_full(core::debug, 3); } +fn bad_bang(i: uint) -> ! { log(debug, 3); } fn main() { bad_bang(5u); } diff --git a/src/test/compile-fail/bad-const-type.rs b/src/test/compile-fail/bad-const-type.rs index 0ef523e753d..c849c17a9cb 100644 --- a/src/test/compile-fail/bad-const-type.rs +++ b/src/test/compile-fail/bad-const-type.rs @@ -1,4 +1,4 @@ // error-pattern:expected str but found int const i: str = 10; -fn main() { log_full(core::debug, i); } +fn main() { log(debug, i); } diff --git a/src/test/compile-fail/bad-env-capture.rs b/src/test/compile-fail/bad-env-capture.rs index 340a38e4993..0246580db1a 100644 --- a/src/test/compile-fail/bad-env-capture.rs +++ b/src/test/compile-fail/bad-env-capture.rs @@ -1,6 +1,6 @@ // error-pattern: attempted dynamic environment-capture fn foo() { let x: int; - fn bar() { log_full(core::debug, x); } + fn bar() { log(debug, x); } } fn main() { foo(); } diff --git a/src/test/compile-fail/bad-env-capture2.rs b/src/test/compile-fail/bad-env-capture2.rs index 420aaa280c2..9c50d29fa4e 100644 --- a/src/test/compile-fail/bad-env-capture2.rs +++ b/src/test/compile-fail/bad-env-capture2.rs @@ -1,5 +1,5 @@ // error-pattern: attempted dynamic environment-capture fn foo(x: int) { - fn bar() { log_full(core::debug, x); } + fn bar() { log(debug, x); } } fn main() { foo(2); } diff --git a/src/test/compile-fail/bad-env-capture3.rs b/src/test/compile-fail/bad-env-capture3.rs index 4b2e2c74ffd..673a22ce11a 100644 --- a/src/test/compile-fail/bad-env-capture3.rs +++ b/src/test/compile-fail/bad-env-capture3.rs @@ -1,7 +1,7 @@ // error-pattern: attempted dynamic environment-capture obj foo(x: int) { fn mth() { - fn bar() { log_full(core::debug, x); } + fn bar() { log(debug, x); } } } diff --git a/src/test/compile-fail/bad-expr-path.rs b/src/test/compile-fail/bad-expr-path.rs index ad9e147deeb..d70d935f602 100644 --- a/src/test/compile-fail/bad-expr-path.rs +++ b/src/test/compile-fail/bad-expr-path.rs @@ -2,4 +2,4 @@ mod m1 { } -fn main(args: [str]) { log_full(core::debug, m1::a); } +fn main(args: [str]) { log(debug, m1::a); } diff --git a/src/test/compile-fail/bad-expr-path2.rs b/src/test/compile-fail/bad-expr-path2.rs index 273f93bac22..da6cfb652b5 100644 --- a/src/test/compile-fail/bad-expr-path2.rs +++ b/src/test/compile-fail/bad-expr-path2.rs @@ -4,4 +4,4 @@ mod m1 { mod a { } } -fn main(args: [str]) { log_full(core::debug, m1::a); } +fn main(args: [str]) { log(debug, m1::a); } diff --git a/src/test/compile-fail/block-coerce-no.rs b/src/test/compile-fail/block-coerce-no.rs index 1a41ece08c0..2985d98a34a 100644 --- a/src/test/compile-fail/block-coerce-no.rs +++ b/src/test/compile-fail/block-coerce-no.rs @@ -12,5 +12,5 @@ fn coerce(b: block()) -> fn() { fn main() { let i = 8; - let f = coerce(block () { log_full(core::error, i); }); + let f = coerce(block () { log(error, i); }); f(); } diff --git a/src/test/compile-fail/block-copy.rs b/src/test/compile-fail/block-copy.rs index 7afefb0f36f..63a2e9bcb39 100644 --- a/src/test/compile-fail/block-copy.rs +++ b/src/test/compile-fail/block-copy.rs @@ -3,6 +3,6 @@ fn lol(f: block()) -> block() { ret f; } fn main() { let i = 8; - let f = lol(block () { log_full(core::error, i); }); + let f = lol(block () { log(error, i); }); f(); } diff --git a/src/test/compile-fail/block-require-return.rs b/src/test/compile-fail/block-require-return.rs index 1bff806ab46..dc14053084d 100644 --- a/src/test/compile-fail/block-require-return.rs +++ b/src/test/compile-fail/block-require-return.rs @@ -1,3 +1,3 @@ // error-pattern: not all control paths return fn force(f: block() -> int) -> int { f() } -fn main() { log_full(core::error, force({|| })); } +fn main() { log(error, force({|| })); } diff --git a/src/test/compile-fail/block-uninit.rs b/src/test/compile-fail/block-uninit.rs index 68870a1b876..4d7f73b341c 100644 --- a/src/test/compile-fail/block-uninit.rs +++ b/src/test/compile-fail/block-uninit.rs @@ -1,4 +1,4 @@ // error-pattern: Unsatisfied precondition constraint fn force(f: block()) { f(); } -fn main() { let x: int; force(block () { log_full(core::error, x); }); } +fn main() { let x: int; force(block () { log(error, x); }); } diff --git a/src/test/compile-fail/break-uninit.rs b/src/test/compile-fail/break-uninit.rs index a7a6a92fd7c..b5e8d2a909f 100644 --- a/src/test/compile-fail/break-uninit.rs +++ b/src/test/compile-fail/break-uninit.rs @@ -6,9 +6,9 @@ fn foo() -> int { do { i = 0; break; x = 0; } while x != 0 - log_full(core::debug, x); + log(debug, x); ret 17; } -fn main() { log_full(core::debug, foo()); } +fn main() { log(debug, foo()); } diff --git a/src/test/compile-fail/break-uninit2.rs b/src/test/compile-fail/break-uninit2.rs index 3547f565451..262e536b445 100644 --- a/src/test/compile-fail/break-uninit2.rs +++ b/src/test/compile-fail/break-uninit2.rs @@ -6,9 +6,9 @@ fn foo() -> int { do { i = 0; break; x = 0; } while 1 != 2 - log_full(core::debug, x); + log(debug, x); ret 17; } -fn main() { log_full(core::debug, foo()); } +fn main() { log(debug, foo()); } diff --git a/src/test/compile-fail/constrained-type-missing-check.rs b/src/test/compile-fail/constrained-type-missing-check.rs index 912a7f27dcc..bed10a12de5 100644 --- a/src/test/compile-fail/constrained-type-missing-check.rs +++ b/src/test/compile-fail/constrained-type-missing-check.rs @@ -12,5 +12,5 @@ fn main() { let a: int = 1; let b: int = 2; let c: ordered_range = {low: a, high: b}; - log_full(core::debug, c.low); + log(debug, c.low); } diff --git a/src/test/compile-fail/copy-a-resource.rs b/src/test/compile-fail/copy-a-resource.rs index 546dbbd411d..c37ccd29f0d 100644 --- a/src/test/compile-fail/copy-a-resource.rs +++ b/src/test/compile-fail/copy-a-resource.rs @@ -2,4 +2,4 @@ resource foo(i: int) { } -fn main() { let x <- foo(10); let y = x; log_full(core::error, x); } +fn main() { let x <- foo(10); let y = x; log(error, x); } diff --git a/src/test/compile-fail/dead-code-be.rs b/src/test/compile-fail/dead-code-be.rs index 68334f0fda0..bc7ec4491ee 100644 --- a/src/test/compile-fail/dead-code-be.rs +++ b/src/test/compile-fail/dead-code-be.rs @@ -3,7 +3,7 @@ // error-pattern: dead -fn f(caller: str) { log_full(core::debug, caller); } +fn f(caller: str) { log(debug, caller); } fn main() { be f("main"); #debug("Paul is dead"); } diff --git a/src/test/compile-fail/dead-code-ret.rs b/src/test/compile-fail/dead-code-ret.rs index f7f530dc90a..3d9ec1dfad3 100644 --- a/src/test/compile-fail/dead-code-ret.rs +++ b/src/test/compile-fail/dead-code-ret.rs @@ -3,7 +3,7 @@ // error-pattern: dead -fn f(caller: str) { log_full(core::debug, caller); } +fn f(caller: str) { log(debug, caller); } fn main() { ret f("main"); #debug("Paul is dead"); } diff --git a/src/test/compile-fail/do-while-constraints.rs b/src/test/compile-fail/do-while-constraints.rs index 479908a8d3c..20bd01fb2ac 100644 --- a/src/test/compile-fail/do-while-constraints.rs +++ b/src/test/compile-fail/do-while-constraints.rs @@ -4,7 +4,7 @@ fn main() { let y: int = 42; let x: int; do { - log_full(core::debug, y); + log(debug, y); do { do { do { x <- y; } while true } while true } while true } while true } diff --git a/src/test/compile-fail/do-while-pred-constraints.rs b/src/test/compile-fail/do-while-pred-constraints.rs index 8bf03564393..b044d56944b 100644 --- a/src/test/compile-fail/do-while-pred-constraints.rs +++ b/src/test/compile-fail/do-while-pred-constraints.rs @@ -1,6 +1,6 @@ // error-pattern: Unsatisfied precondition constraint (for example, even(y -fn print_even(y: int) : even(y) { log_full(core::debug, y); } +fn print_even(y: int) : even(y) { log(debug, y); } pure fn even(y: int) -> bool { true } diff --git a/src/test/compile-fail/export.rs b/src/test/compile-fail/export.rs index 13163fa32f2..bda344587d9 100644 --- a/src/test/compile-fail/export.rs +++ b/src/test/compile-fail/export.rs @@ -1,8 +1,8 @@ // error-pattern: unresolved name mod foo { export x; - fn x(y: int) { log_full(core::debug, y); } - fn z(y: int) { log_full(core::debug, y); } + fn x(y: int) { log(debug, y); } + fn z(y: int) { log(debug, y); } } fn main() { foo::z(10); } diff --git a/src/test/compile-fail/fn-constraint.rs b/src/test/compile-fail/fn-constraint.rs index e5fac40b8fb..aadbecc40a7 100644 --- a/src/test/compile-fail/fn-constraint.rs +++ b/src/test/compile-fail/fn-constraint.rs @@ -5,5 +5,5 @@ import str::*; fn main() { let a: uint = 4u; let b: uint = 1u; - log_full(core::error, safe_slice("kitties", a, b)); + log(error, safe_slice("kitties", a, b)); } diff --git a/src/test/compile-fail/fn-expr-type-state.rs b/src/test/compile-fail/fn-expr-type-state.rs index 9c998682fc3..5eb7541a520 100644 --- a/src/test/compile-fail/fn-expr-type-state.rs +++ b/src/test/compile-fail/fn-expr-type-state.rs @@ -3,5 +3,5 @@ fn main() { // Typestate should work even in a lambda. we should reject this program. let f = fn () -> int { let i: int; ret i; }; - log_full(core::error, f()); + log(error, f()); } diff --git a/src/test/compile-fail/fn-expr-typestate-2.rs b/src/test/compile-fail/fn-expr-typestate-2.rs index 5f2e6db0e8b..8e35bc341b1 100644 --- a/src/test/compile-fail/fn-expr-typestate-2.rs +++ b/src/test/compile-fail/fn-expr-typestate-2.rs @@ -2,5 +2,5 @@ fn main() { let j = fn () -> int { let i: int; ret i; }(); - log_full(core::error, j); + log(error, j); } diff --git a/src/test/compile-fail/if-check-precond-fail.rs b/src/test/compile-fail/if-check-precond-fail.rs index 69dedb57955..cd6ebeb126b 100644 --- a/src/test/compile-fail/if-check-precond-fail.rs +++ b/src/test/compile-fail/if-check-precond-fail.rs @@ -5,7 +5,7 @@ pure fn even(x: uint) -> bool { } else if x == 2u { ret true; } else { ret even(x - 2u); } } -fn print_even(x: uint) : even(x) { log_full(core::debug, x); } +fn print_even(x: uint) : even(x) { log(debug, x); } fn foo(x: uint) { if check even(x) { fail; } else { print_even(x); } } diff --git a/src/test/compile-fail/if-without-else-result.rs b/src/test/compile-fail/if-without-else-result.rs index 6c560ffb41d..0ff469a871c 100644 --- a/src/test/compile-fail/if-without-else-result.rs +++ b/src/test/compile-fail/if-without-else-result.rs @@ -2,5 +2,5 @@ fn main() { let a = if true { true }; - log_full(core::debug, a); + log(debug, a); } \ No newline at end of file diff --git a/src/test/compile-fail/lambda-mutate-nested.rs b/src/test/compile-fail/lambda-mutate-nested.rs index 8b5da1c196a..0a733687aa3 100644 --- a/src/test/compile-fail/lambda-mutate-nested.rs +++ b/src/test/compile-fail/lambda-mutate-nested.rs @@ -6,10 +6,10 @@ fn f2(x: block()) { x(); } fn main() { let i = 0; let ctr = lambda () -> int { f2({|| i = i + 1; }); ret i; }; - log_full(core::error, ctr()); - log_full(core::error, ctr()); - log_full(core::error, ctr()); - log_full(core::error, ctr()); - log_full(core::error, ctr()); - log_full(core::error, i); + log(error, ctr()); + log(error, ctr()); + log(error, ctr()); + log(error, ctr()); + log(error, ctr()); + log(error, i); } diff --git a/src/test/compile-fail/lambda-mutate.rs b/src/test/compile-fail/lambda-mutate.rs index c5b90f9edde..6ba1cfc5401 100644 --- a/src/test/compile-fail/lambda-mutate.rs +++ b/src/test/compile-fail/lambda-mutate.rs @@ -3,10 +3,10 @@ fn main() { let i = 0; let ctr = lambda () -> int { i = i + 1; ret i; }; - log_full(core::error, ctr()); - log_full(core::error, ctr()); - log_full(core::error, ctr()); - log_full(core::error, ctr()); - log_full(core::error, ctr()); - log_full(core::error, i); + log(error, ctr()); + log(error, ctr()); + log(error, ctr()); + log(error, ctr()); + log(error, ctr()); + log(error, i); } diff --git a/src/test/compile-fail/move-arg.rs b/src/test/compile-fail/move-arg.rs index fd5566e5c32..711e9a7095c 100644 --- a/src/test/compile-fail/move-arg.rs +++ b/src/test/compile-fail/move-arg.rs @@ -1,4 +1,4 @@ // error-pattern: Unsatisfied precondition constraint fn test(-foo: int) { assert (foo == 10); } -fn main() { let x = 10; test(x); log_full(core::debug, x); } +fn main() { let x = 10; test(x); log(debug, x); } diff --git a/src/test/compile-fail/no-constraint-prop.rs b/src/test/compile-fail/no-constraint-prop.rs index 8cae7c2fc36..2a03395f1c1 100644 --- a/src/test/compile-fail/no-constraint-prop.rs +++ b/src/test/compile-fail/no-constraint-prop.rs @@ -16,5 +16,5 @@ fn main() { // the next statement, since it's not true in the // prestate. let d <- a; - log_full(core::debug, safe_slice("kitties", b, d)); + log(debug, safe_slice("kitties", b, d)); } diff --git a/src/test/compile-fail/nonscalar-cast.rs b/src/test/compile-fail/nonscalar-cast.rs index 95de145e52e..4347044d2a3 100644 --- a/src/test/compile-fail/nonscalar-cast.rs +++ b/src/test/compile-fail/nonscalar-cast.rs @@ -4,5 +4,5 @@ use std; import std::os; fn main() { - log_full(core::debug, { x: 1 } as int); + log(debug, { x: 1 } as int); } diff --git a/src/test/compile-fail/nonsense-constraints.rs b/src/test/compile-fail/nonsense-constraints.rs index 527644907f0..08b261a2ccd 100644 --- a/src/test/compile-fail/nonsense-constraints.rs +++ b/src/test/compile-fail/nonsense-constraints.rs @@ -10,4 +10,4 @@ fn enum_chars(start: u8, end: u8) : uint::le(start, end) -> [char] { ret r; } -fn main() { log_full(core::debug, enum_chars('a' as u8, 'z' as u8)); } +fn main() { log(debug, enum_chars('a' as u8, 'z' as u8)); } diff --git a/src/test/compile-fail/or-init.rs b/src/test/compile-fail/or-init.rs index 54ab6c3c1b7..778a9d8cb7b 100644 --- a/src/test/compile-fail/or-init.rs +++ b/src/test/compile-fail/or-init.rs @@ -3,6 +3,6 @@ fn main() { let i: int; - log_full(core::debug, false || { i = 5; true }); - log_full(core::debug, i); + log(debug, false || { i = 5; true }); + log(debug, i); } diff --git a/src/test/compile-fail/oversized-literal.rs b/src/test/compile-fail/oversized-literal.rs index c189c97ded9..005a29cc435 100644 --- a/src/test/compile-fail/oversized-literal.rs +++ b/src/test/compile-fail/oversized-literal.rs @@ -1,3 +1,3 @@ // error-pattern:literal out of range -fn main() { log_full(core::debug, 300u8); } +fn main() { log(debug, 300u8); } diff --git a/src/test/compile-fail/pattern-tyvar.rs b/src/test/compile-fail/pattern-tyvar.rs index 3484a14f084..8190b74efc7 100644 --- a/src/test/compile-fail/pattern-tyvar.rs +++ b/src/test/compile-fail/pattern-tyvar.rs @@ -10,7 +10,7 @@ tag bar { t1((), option::t<[int]>); t2; } fn foo(t: bar) { alt t { t1(_, some::<int>(x)) { - log_full(core::debug, x); + log(debug, x); } _ { fail; } } diff --git a/src/test/compile-fail/pinned-deep-copy.rs b/src/test/compile-fail/pinned-deep-copy.rs index a7c7d06cb5f..9244b4b73b3 100644 --- a/src/test/compile-fail/pinned-deep-copy.rs +++ b/src/test/compile-fail/pinned-deep-copy.rs @@ -10,7 +10,7 @@ fn main() { // Can't do this copy let x = ~~~{y: r(i)}; let z = x; - log_full(core::debug, x); + log(debug, x); } - log_full(core::error, *i); + log(error, *i); } \ No newline at end of file diff --git a/src/test/compile-fail/rec-missing-fields.rs b/src/test/compile-fail/rec-missing-fields.rs index 523641698d3..fad12e24a7c 100644 --- a/src/test/compile-fail/rec-missing-fields.rs +++ b/src/test/compile-fail/rec-missing-fields.rs @@ -6,4 +6,4 @@ type point = {x: int, y: int}; -fn main() { let p: point = {x: 10}; log_full(core::debug, p.y); } +fn main() { let p: point = {x: 10}; log(debug, p.y); } diff --git a/src/test/compile-fail/record-with-resource.rs b/src/test/compile-fail/record-with-resource.rs index ff6a197abf8..6cdaafb22a5 100644 --- a/src/test/compile-fail/record-with-resource.rs +++ b/src/test/compile-fail/record-with-resource.rs @@ -1,13 +1,13 @@ // error-pattern: copying a noncopyable value resource my_resource(x: int) { - log_full(core::error, x); + log(error, x); } fn main() { { let a = {x: 0, y: my_resource(20)}; let b = {x: 2 with a}; - log_full(core::error, (a, b)); + log(error, (a, b)); } } diff --git a/src/test/compile-fail/reference-in-loop.rs b/src/test/compile-fail/reference-in-loop.rs index a21523d0763..403e0bb07cb 100644 --- a/src/test/compile-fail/reference-in-loop.rs +++ b/src/test/compile-fail/reference-in-loop.rs @@ -4,7 +4,7 @@ fn main() { let x = []; let &y = x; while true { - log_full(core::error, y); + log(error, y); x = [1]; } } diff --git a/src/test/compile-fail/sendfn-is-not-a-lambda.rs b/src/test/compile-fail/sendfn-is-not-a-lambda.rs index 4cc76c93a17..3456a4f6a1a 100644 --- a/src/test/compile-fail/sendfn-is-not-a-lambda.rs +++ b/src/test/compile-fail/sendfn-is-not-a-lambda.rs @@ -6,5 +6,5 @@ fn test(f: lambda(uint) -> uint) -> uint { fn main() { let f = sendfn(x: uint) -> uint { ret 4u; }; - log_full(core::debug, test(f)); + log(debug, test(f)); } \ No newline at end of file diff --git a/src/test/compile-fail/unique-pinned-nocopy.rs b/src/test/compile-fail/unique-pinned-nocopy.rs index 4cf50b119f8..97e4515d98d 100644 --- a/src/test/compile-fail/unique-pinned-nocopy.rs +++ b/src/test/compile-fail/unique-pinned-nocopy.rs @@ -6,5 +6,5 @@ resource r(b: bool) { fn main() { let i <- ~r(true); let j = i; - log_full(core::debug, i); + log(debug, i); } \ No newline at end of file diff --git a/src/test/compile-fail/unique-vec-res.rs b/src/test/compile-fail/unique-vec-res.rs index 9fa456aaacb..fdc9072fd93 100644 --- a/src/test/compile-fail/unique-vec-res.rs +++ b/src/test/compile-fail/unique-vec-res.rs @@ -14,6 +14,6 @@ fn main() { let r1 <- [~r(i1)]; let r2 <- [~r(i2)]; f(r1, r2); - log_full(core::debug, (r2, *i1)); - log_full(core::debug, (r1, *i2)); + log(debug, (r2, *i1)); + log(debug, (r1, *i2)); } \ No newline at end of file diff --git a/src/test/compile-fail/unsafe-alias-2.rs b/src/test/compile-fail/unsafe-alias-2.rs index 94b95e190bd..ec1e5c01ffb 100644 --- a/src/test/compile-fail/unsafe-alias-2.rs +++ b/src/test/compile-fail/unsafe-alias-2.rs @@ -4,5 +4,5 @@ fn whoknows(x: @mutable {mutable x: int}) { x.x = 10; } fn main() { let box = @mutable {mutable x: 1}; - alt *box { x { whoknows(box); log_full(core::error, x); } } + alt *box { x { whoknows(box); log(error, x); } } } diff --git a/src/test/compile-fail/unsafe-alias.rs b/src/test/compile-fail/unsafe-alias.rs index 2b71a5e72d8..905a6a922f1 100644 --- a/src/test/compile-fail/unsafe-alias.rs +++ b/src/test/compile-fail/unsafe-alias.rs @@ -1,6 +1,6 @@ // error-pattern:may alias with argument -fn foo(x: {mutable x: int}, f: fn@()) { log_full(core::debug, x); } +fn foo(x: {mutable x: int}, f: fn@()) { log(debug, x); } fn whoknows(x: @mutable {mutable x: int}) { *x = {mutable x: 10}; } diff --git a/src/test/compile-fail/unsafe-alt.rs b/src/test/compile-fail/unsafe-alt.rs index e19edcfddc7..56adb4411ba 100644 --- a/src/test/compile-fail/unsafe-alt.rs +++ b/src/test/compile-fail/unsafe-alt.rs @@ -4,5 +4,5 @@ tag foo { left({mutable x: int}); right(bool); } fn main() { let x = left({mutable x: 10}); - alt x { left(i) { x = right(false); log_full(core::debug, i); } _ { } } + alt x { left(i) { x = right(false); log(debug, i); } _ { } } } diff --git a/src/test/compile-fail/unsafe-for.rs b/src/test/compile-fail/unsafe-for.rs index caaab6d8977..05bad8ee833 100644 --- a/src/test/compile-fail/unsafe-for.rs +++ b/src/test/compile-fail/unsafe-for.rs @@ -2,5 +2,5 @@ fn main() { let v: [mutable {mutable x: int}] = [mutable {mutable x: 1}]; - for x in v { v[0] = {mutable x: 2}; log_full(core::debug, x); } + for x in v { v[0] = {mutable x: 2}; log(debug, x); } } diff --git a/src/test/compile-fail/unsafe-mutable-alias.rs b/src/test/compile-fail/unsafe-mutable-alias.rs index f740d7d7592..3ab7fe974a5 100644 --- a/src/test/compile-fail/unsafe-mutable-alias.rs +++ b/src/test/compile-fail/unsafe-mutable-alias.rs @@ -5,4 +5,4 @@ fn f(a: {mutable x: int}, &b: {mutable x: int}) -> int { ret a.x + b.x; } -fn main() { let i = {mutable x: 4}; log_full(core::debug, f(i, i)); } +fn main() { let i = {mutable x: 4}; log(debug, f(i, i)); } diff --git a/src/test/compile-fail/unsupported-cast.rs b/src/test/compile-fail/unsupported-cast.rs index 26decd8baeb..6beb247e931 100644 --- a/src/test/compile-fail/unsupported-cast.rs +++ b/src/test/compile-fail/unsupported-cast.rs @@ -4,5 +4,5 @@ use std; import std::os; fn main() { - log_full(core::debug, 1.0 as os::libc::FILE); // Can't cast float to native. + log(debug, 1.0 as os::libc::FILE); // Can't cast float to native. } diff --git a/src/test/compile-fail/use-after-move.rs b/src/test/compile-fail/use-after-move.rs index e0a06d73acc..d4d42b55538 100644 --- a/src/test/compile-fail/use-after-move.rs +++ b/src/test/compile-fail/use-after-move.rs @@ -1,2 +1,2 @@ // error-pattern: Unsatisfied precondition constraint (for example, init(x -fn main() { let x = @5; let y <- x; log_full(core::debug, *x); } +fn main() { let x = @5; let y <- x; log(debug, *x); } diff --git a/src/test/compile-fail/use-after-send.rs b/src/test/compile-fail/use-after-send.rs index dfd34aa1168..7dc3f7b4a32 100644 --- a/src/test/compile-fail/use-after-send.rs +++ b/src/test/compile-fail/use-after-send.rs @@ -1,16 +1,16 @@ // error-pattern: Unsatisfied precondition constraint fn send<send T>(ch: _chan<T>, -data: T) { - log_full(core::debug, ch); - log_full(core::debug, data); + log(debug, ch); + log(debug, data); fail; } type _chan<T> = int; -// Tests that "log_full(core::debug, message);" is flagged as using +// Tests that "log(debug, message);" is flagged as using // message after the send deinitializes it fn test00_start(ch: _chan<int>, message: int, count: int) { send(ch, message); - log_full(core::debug, message); + log(debug, message); } fn main() { fail; } diff --git a/src/test/compile-fail/use-uninit-2.rs b/src/test/compile-fail/use-uninit-2.rs index abbca6008fc..be949453699 100644 --- a/src/test/compile-fail/use-uninit-2.rs +++ b/src/test/compile-fail/use-uninit-2.rs @@ -1,5 +1,5 @@ // error-pattern:Unsatisfied precondition -fn foo(x: int) { log_full(core::debug, x); } +fn foo(x: int) { log(debug, x); } fn main() { let x: int; if 1 > 2 { x = 10; } foo(x); } diff --git a/src/test/compile-fail/use-uninit-3.rs b/src/test/compile-fail/use-uninit-3.rs index e731ba4f083..b824567133a 100644 --- a/src/test/compile-fail/use-uninit-3.rs +++ b/src/test/compile-fail/use-uninit-3.rs @@ -1,6 +1,6 @@ // error-pattern:Unsatisfied precondition -fn foo(x: int) { log_full(core::debug, x); } +fn foo(x: int) { log(debug, x); } fn main() { let x: int; diff --git a/src/test/compile-fail/use-uninit.rs b/src/test/compile-fail/use-uninit.rs index 5fac7d3ee6b..5c3c9a3cda7 100644 --- a/src/test/compile-fail/use-uninit.rs +++ b/src/test/compile-fail/use-uninit.rs @@ -1,5 +1,5 @@ // error-pattern:Unsatisfied precondition -fn foo(x: int) { log_full(core::debug, x); } +fn foo(x: int) { log(debug, x); } fn main() { let x: int; foo(x); } diff --git a/src/test/compile-fail/vec-field.rs b/src/test/compile-fail/vec-field.rs index c376441163d..df697c8af67 100644 --- a/src/test/compile-fail/vec-field.rs +++ b/src/test/compile-fail/vec-field.rs @@ -3,7 +3,7 @@ fn f() { let v = [1]; - log_full(core::debug, v.some_field_name); //type error + log(debug, v.some_field_name); //type error } fn main() { } diff --git a/src/test/compile-fail/vec-res-add.rs b/src/test/compile-fail/vec-res-add.rs index d2fb07bd1f7..ce1aae2fa8a 100644 --- a/src/test/compile-fail/vec-res-add.rs +++ b/src/test/compile-fail/vec-res-add.rs @@ -7,5 +7,5 @@ fn main() { let i <- [r(0)]; let j <- [r(1)]; let k = i + j; - log_full(core::debug, j); + log(debug, j); } diff --git a/src/test/compile-fail/while-loop-constraints.rs b/src/test/compile-fail/while-loop-constraints.rs index 15cb4ab9902..287ee2d684c 100644 --- a/src/test/compile-fail/while-loop-constraints.rs +++ b/src/test/compile-fail/while-loop-constraints.rs @@ -4,7 +4,7 @@ fn main() { let y: int = 42; let x: int; while true { - log_full(core::debug, y); + log(debug, y); while true { while true { while true { x <- y; } diff --git a/src/test/compile-fail/while-loop-pred-constraints.rs b/src/test/compile-fail/while-loop-pred-constraints.rs index 6ea21de7f58..aa31a3857dc 100644 --- a/src/test/compile-fail/while-loop-pred-constraints.rs +++ b/src/test/compile-fail/while-loop-pred-constraints.rs @@ -1,6 +1,6 @@ // error-pattern: Unsatisfied precondition constraint (for example, even(y -fn print_even(y: int) : even(y) { log_full(core::debug, y); } +fn print_even(y: int) : even(y) { log(debug, y); } pure fn even(y: int) -> bool { true } |
