diff options
| author | Ben Blum <bblum@andrew.cmu.edu> | 2013-06-24 15:50:38 -0400 |
|---|---|---|
| committer | Ben Blum <bblum@andrew.cmu.edu> | 2013-06-26 18:14:43 -0400 |
| commit | d0f56db9630f4b01a6a170aac220aa1b891d5016 (patch) | |
| tree | 39fa09635e12e145b605363b2bce6cd44004d86a | |
| parent | ffc8c0ba210630121c58290b1652fea66e0d1da8 (diff) | |
| download | rust-d0f56db9630f4b01a6a170aac220aa1b891d5016.tar.gz rust-d0f56db9630f4b01a6a170aac220aa1b891d5016.zip | |
Change expected error message in kindchk compile-fail tests.
| -rw-r--r-- | src/test/compile-fail/kindck-nonsendable-1.rs | 6 | ||||
| -rw-r--r-- | src/test/compile-fail/kindck-owned-trait.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/kindck-owned.rs | 3 | ||||
| -rw-r--r-- | src/test/compile-fail/no-send-res-ports.rs | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/test/compile-fail/kindck-nonsendable-1.rs b/src/test/compile-fail/kindck-nonsendable-1.rs index 928abae2423..38983a9aca6 100644 --- a/src/test/compile-fail/kindck-nonsendable-1.rs +++ b/src/test/compile-fail/kindck-nonsendable-1.rs @@ -12,7 +12,7 @@ fn foo(_x: @uint) {} fn main() { let x = @3u; - let _: ~fn() = || foo(x); //~ ERROR value has non-owned type `@uint` - let _: ~fn() = || foo(x); //~ ERROR value has non-owned type `@uint` - let _: ~fn() = || foo(x); //~ ERROR value has non-owned type `@uint` + let _: ~fn() = || foo(x); //~ ERROR does not fulfill `Owned` + let _: ~fn() = || foo(x); //~ ERROR does not fulfill `Owned` + let _: ~fn() = || foo(x); //~ ERROR does not fulfill `Owned` } diff --git a/src/test/compile-fail/kindck-owned-trait.rs b/src/test/compile-fail/kindck-owned-trait.rs index 857c71db72c..c2352e35a46 100644 --- a/src/test/compile-fail/kindck-owned-trait.rs +++ b/src/test/compile-fail/kindck-owned-trait.rs @@ -11,7 +11,9 @@ trait foo { fn foo(&self); } fn to_foo<T:Copy + foo>(t: T) -> @foo { - @t as @foo //~ ERROR value may contain borrowed pointers; add `'static` bound + @t as @foo + //~^ ERROR value may contain borrowed pointers; add `'static` bound + //~^^ ERROR cannot pack type } fn to_foo2<T:Copy + foo + 'static>(t: T) -> @foo { diff --git a/src/test/compile-fail/kindck-owned.rs b/src/test/compile-fail/kindck-owned.rs index ec84551f7b0..3f859b7dc84 100644 --- a/src/test/compile-fail/kindck-owned.rs +++ b/src/test/compile-fail/kindck-owned.rs @@ -9,8 +9,7 @@ // except according to those terms. fn copy1<T:Copy>(t: T) -> @fn() -> T { - let result: @fn() -> T = || copy t; - //~^ ERROR value may contain borrowed pointers + let result: @fn() -> T = || copy t; //~ ERROR does not fulfill `'static` result } diff --git a/src/test/compile-fail/no-send-res-ports.rs b/src/test/compile-fail/no-send-res-ports.rs index 1f5b600157f..605e59d56c8 100644 --- a/src/test/compile-fail/no-send-res-ports.rs +++ b/src/test/compile-fail/no-send-res-ports.rs @@ -32,7 +32,7 @@ fn main() { let x = Cell::new(foo(Port(@()))); do task::spawn { - let y = x.take(); //~ ERROR value has non-owned type + let y = x.take(); //~ ERROR does not fulfill `Owned` error!(y); } } |