diff options
| author | Lenny222 <github@kudling.de> | 2011-12-25 20:27:09 +0100 |
|---|---|---|
| committer | Lenny222 <github@kudling.de> | 2011-12-25 20:27:09 +0100 |
| commit | 0b9751b141af92cc41795c99e64b706b402617cd (patch) | |
| tree | ab0c47314a2d04e0cfb814f53b14105575dc291d /src/test | |
| parent | b3eb9a003165e800d2c48083d794cb9879f3be89 (diff) | |
| download | rust-0b9751b141af92cc41795c99e64b706b402617cd.tar.gz rust-0b9751b141af92cc41795c99e64b706b402617cd.zip | |
Use singlequotes in the typechecker too, to distinguish code and English
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/compile-fail/bad-const-type.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/bad-record-pat-2.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/fail-type-err.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/fn-bare-bind.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/fn-compare-mismatch.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/main-wrong-type-2.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/main-wrong-type.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/minus-string.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/native-type-mismatch.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/nonsense-constraints.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/rec-extend.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/sendfn-is-not-a-lambda.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/type-mismatch-multiple.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/type-mismatch.rs | 2 |
14 files changed, 17 insertions, 17 deletions
diff --git a/src/test/compile-fail/bad-const-type.rs b/src/test/compile-fail/bad-const-type.rs index c849c17a9cb..d37292a2346 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 +// error-pattern:expected 'str' but found 'int' const i: str = 10; fn main() { log(debug, i); } diff --git a/src/test/compile-fail/bad-record-pat-2.rs b/src/test/compile-fail/bad-record-pat-2.rs index 54ae70a8661..139b378a956 100644 --- a/src/test/compile-fail/bad-record-pat-2.rs +++ b/src/test/compile-fail/bad-record-pat-2.rs @@ -1,3 +1,3 @@ -// error-pattern:did not expect a record with a field q +// error-pattern:did not expect a record with a field 'q' fn main() { alt {x: 1, y: 2} { {x: x, q: q} { } } } diff --git a/src/test/compile-fail/fail-type-err.rs b/src/test/compile-fail/fail-type-err.rs index 8ea86d80a7b..abdb353886e 100644 --- a/src/test/compile-fail/fail-type-err.rs +++ b/src/test/compile-fail/fail-type-err.rs @@ -1,2 +1,2 @@ -// error-pattern:expected str but found [int] +// error-pattern:expected 'str' but found '[int]' fn main() { fail [0]; } diff --git a/src/test/compile-fail/fn-bare-bind.rs b/src/test/compile-fail/fn-bare-bind.rs index 1635a91c14f..98d4b29d280 100644 --- a/src/test/compile-fail/fn-bare-bind.rs +++ b/src/test/compile-fail/fn-bare-bind.rs @@ -1,4 +1,4 @@ -// error-pattern:mismatched types: expected fn() but found fn@() +// error-pattern:mismatched types: expected 'fn()' but found 'fn@()' fn f() { } @@ -6,4 +6,4 @@ fn f() { fn main() { // Can't produce a bare function by binding let g: fn() = bind f(); -} \ No newline at end of file +} diff --git a/src/test/compile-fail/fn-compare-mismatch.rs b/src/test/compile-fail/fn-compare-mismatch.rs index 56238a6026f..a7db554ea2f 100644 --- a/src/test/compile-fail/fn-compare-mismatch.rs +++ b/src/test/compile-fail/fn-compare-mismatch.rs @@ -1,4 +1,4 @@ -// error-pattern:expected fn() but found fn(++int) +// error-pattern:expected 'fn()' but found 'fn(++int)' fn main() { fn f() { } diff --git a/src/test/compile-fail/main-wrong-type-2.rs b/src/test/compile-fail/main-wrong-type-2.rs index e3d5ca40d08..8335e3c8c1d 100644 --- a/src/test/compile-fail/main-wrong-type-2.rs +++ b/src/test/compile-fail/main-wrong-type-2.rs @@ -1,2 +1,2 @@ -// error-pattern:wrong type in main function: found fn() -> char +// error-pattern:wrong type in main function: found 'fn() -> char' fn main() -> char { } diff --git a/src/test/compile-fail/main-wrong-type.rs b/src/test/compile-fail/main-wrong-type.rs index 2be4af77008..9a00f49c93b 100644 --- a/src/test/compile-fail/main-wrong-type.rs +++ b/src/test/compile-fail/main-wrong-type.rs @@ -1,2 +1,2 @@ -// error-pattern:wrong type in main function: found fn( +// error-pattern:wrong type in main function: found 'fn(&&{x: int,y: int})' fn main(foo: {x: int, y: int}) { } diff --git a/src/test/compile-fail/minus-string.rs b/src/test/compile-fail/minus-string.rs index e30a2dbe7df..c16c0e54a49 100644 --- a/src/test/compile-fail/minus-string.rs +++ b/src/test/compile-fail/minus-string.rs @@ -1,3 +1,3 @@ -// error-pattern:applying unary minus to non-numeric type str +// error-pattern:applying unary minus to non-numeric type 'str' fn main() { -"foo"; } diff --git a/src/test/compile-fail/native-type-mismatch.rs b/src/test/compile-fail/native-type-mismatch.rs index fb084792532..ebf25e8f362 100644 --- a/src/test/compile-fail/native-type-mismatch.rs +++ b/src/test/compile-fail/native-type-mismatch.rs @@ -1,4 +1,4 @@ -// error-pattern:expected *Mb but found native +// error-pattern:expected '*Mb' but found 'native' use std; fn main() unsafe { diff --git a/src/test/compile-fail/nonsense-constraints.rs b/src/test/compile-fail/nonsense-constraints.rs index 08b261a2ccd..f78bb519d84 100644 --- a/src/test/compile-fail/nonsense-constraints.rs +++ b/src/test/compile-fail/nonsense-constraints.rs @@ -1,5 +1,5 @@ // Tests that the typechecker checks constraints -// error-pattern:mismatched types: expected uint but found u8 +// error-pattern:mismatched types: expected 'uint' but found 'u8' use std; import uint; diff --git a/src/test/compile-fail/rec-extend.rs b/src/test/compile-fail/rec-extend.rs index 35f884fbff9..5862c1c985b 100644 --- a/src/test/compile-fail/rec-extend.rs +++ b/src/test/compile-fail/rec-extend.rs @@ -1,4 +1,4 @@ -// error-pattern:expected int but found bool +// error-pattern:expected 'int' but found 'bool' fn main() { 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 3456a4f6a1a..ef55eb40d37 100644 --- a/src/test/compile-fail/sendfn-is-not-a-lambda.rs +++ b/src/test/compile-fail/sendfn-is-not-a-lambda.rs @@ -1,4 +1,4 @@ -// error-pattern: mismatched types: expected lambda(++uint) -> uint +// error-pattern: mismatched types: expected 'lambda(++uint) -> uint' fn test(f: lambda(uint) -> uint) -> uint { ret f(22u); @@ -7,4 +7,4 @@ fn test(f: lambda(uint) -> uint) -> uint { fn main() { let f = sendfn(x: uint) -> uint { ret 4u; }; log(debug, test(f)); -} \ No newline at end of file +} diff --git a/src/test/compile-fail/type-mismatch-multiple.rs b/src/test/compile-fail/type-mismatch-multiple.rs index 363af271986..936776cbdfc 100644 --- a/src/test/compile-fail/type-mismatch-multiple.rs +++ b/src/test/compile-fail/type-mismatch-multiple.rs @@ -1,5 +1,5 @@ // Checking that the compiler reports multiple type errors at once -// error-pattern:mismatched types: expected bool -// error-pattern:mismatched types: expected int +// error-pattern:mismatched types: expected 'bool' +// error-pattern:mismatched types: expected 'int' fn main() { let a: bool = 1; let b: int = true; } diff --git a/src/test/compile-fail/type-mismatch.rs b/src/test/compile-fail/type-mismatch.rs index d2ddf61b0bc..6cae41b9b9f 100644 --- a/src/test/compile-fail/type-mismatch.rs +++ b/src/test/compile-fail/type-mismatch.rs @@ -1,4 +1,4 @@ -// error-pattern:expected bool but found int +// error-pattern:expected 'bool' but found 'int' // issue #516 fn main() { let x = true; let y = 1; let z = x + y; } |
