diff options
| author | Michael Sullivan <sully@msully.net> | 2012-07-11 19:31:15 -0700 |
|---|---|---|
| committer | Michael Sullivan <sully@msully.net> | 2012-07-12 00:21:04 -0700 |
| commit | 7b265035661daefd7d30f05896a748e55bb561b0 (patch) | |
| tree | d4ba965cedf3d7ca6b1dd789ac72a1608e7c74da /src/test | |
| parent | b569bdec9fc6637ae35148caad4823906a7829b4 (diff) | |
| download | rust-7b265035661daefd7d30f05896a748e55bb561b0.tar.gz rust-7b265035661daefd7d30f05896a748e55bb561b0.zip | |
Make str be treated as str/~.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/compile-fail/bad-const-type.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/binop-bitxor-str.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/fail-type-err.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/map-types.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/minus-string.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/missing-do.rs | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/test/compile-fail/bad-const-type.rs b/src/test/compile-fail/bad-const-type.rs index f5f788a2458..8b86db098e5 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 = 10i; fn main() { log(debug, i); } diff --git a/src/test/compile-fail/binop-bitxor-str.rs b/src/test/compile-fail/binop-bitxor-str.rs index 65e0996fa62..53bb7d8f53d 100644 --- a/src/test/compile-fail/binop-bitxor-str.rs +++ b/src/test/compile-fail/binop-bitxor-str.rs @@ -1,3 +1,3 @@ -// error-pattern:^ cannot be applied to type `str` +// error-pattern:^ cannot be applied to type `str/~` fn main() { let x = "a" ^ "b"; } diff --git a/src/test/compile-fail/fail-type-err.rs b/src/test/compile-fail/fail-type-err.rs index eb44ccf413c..3f9bda61c80 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 ~[0i]; } diff --git a/src/test/compile-fail/map-types.rs b/src/test/compile-fail/map-types.rs index 084cbf9529c..9386c152648 100644 --- a/src/test/compile-fail/map-types.rs +++ b/src/test/compile-fail/map-types.rs @@ -8,5 +8,5 @@ import std::map::map; fn main() { let x: map<str,str> = map::str_hash::<str>() as map::<str,str>; let y: map<uint,str> = x; - //~^ ERROR mismatched types: expected `std::map::map<uint,str>` + //~^ ERROR mismatched types: expected `std::map::map<uint,str/~>` } diff --git a/src/test/compile-fail/minus-string.rs b/src/test/compile-fail/minus-string.rs index 27ed51852a4..043d46f121b 100644 --- a/src/test/compile-fail/minus-string.rs +++ b/src/test/compile-fail/minus-string.rs @@ -1,3 +1,3 @@ -// error-pattern:cannot apply unary operator `-` to type `str` +// error-pattern:cannot apply unary operator `-` to type `str/~` fn main() { -"foo"; } diff --git a/src/test/compile-fail/missing-do.rs b/src/test/compile-fail/missing-do.rs index 23905d14ffa..31595875058 100644 --- a/src/test/compile-fail/missing-do.rs +++ b/src/test/compile-fail/missing-do.rs @@ -3,7 +3,7 @@ fn foo(f: fn()) { f() } fn main() { - "" || 42; //~ ERROR binary operation || cannot be applied to type `str` + "" || 42; //~ ERROR binary operation || cannot be applied to type `str/~` foo || {}; //~ ERROR binary operation || cannot be applied to type `extern fn(fn())` //~^ NOTE did you forget the 'do' keyword for the call? } |