about summary refs log tree commit diff
path: root/src/test/compile-fail/object-lifetime-default-from-box-error.rs
diff options
context:
space:
mode:
authorNick Cameron <ncameron@mozilla.com>2015-04-15 11:57:29 +1200
committerNick Cameron <ncameron@mozilla.com>2015-05-13 14:19:51 +1200
commit843db01bd925279da0a56efde532c9e3ecf73610 (patch)
treeeed89761dcb0ddeb578ca24357ef680787eabb43 /src/test/compile-fail/object-lifetime-default-from-box-error.rs
parentc2b30b86df6b34ba19e87e63402e43d9e81a64fb (diff)
downloadrust-843db01bd925279da0a56efde532c9e3ecf73610.tar.gz
rust-843db01bd925279da0a56efde532c9e3ecf73610.zip
eddyb's changes for DST coercions
+ lots of rebasing
Diffstat (limited to 'src/test/compile-fail/object-lifetime-default-from-box-error.rs')
-rw-r--r--src/test/compile-fail/object-lifetime-default-from-box-error.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/compile-fail/object-lifetime-default-from-box-error.rs b/src/test/compile-fail/object-lifetime-default-from-box-error.rs
index 7fae530984f..dd94dfe1e08 100644
--- a/src/test/compile-fail/object-lifetime-default-from-box-error.rs
+++ b/src/test/compile-fail/object-lifetime-default-from-box-error.rs
@@ -25,7 +25,7 @@ fn load(ss: &mut SomeStruct) -> Box<SomeTrait> {
     // `Box<SomeTrait>` defaults to a `'static` bound, so this return
     // is illegal.
 
-    ss.r //~ ERROR lifetime of the source pointer does not outlive lifetime bound
+    ss.r //~ ERROR lifetime bound not satisfied
 }
 
 fn store(ss: &mut SomeStruct, b: Box<SomeTrait>) {
@@ -38,7 +38,7 @@ fn store(ss: &mut SomeStruct, b: Box<SomeTrait>) {
 fn store1<'b>(ss: &mut SomeStruct, b: Box<SomeTrait+'b>) {
     // Here we override the lifetimes explicitly, and so naturally we get an error.
 
-    ss.r = b; //~ ERROR lifetime of the source pointer does not outlive lifetime bound
+    ss.r = b; //~ ERROR lifetime bound not satisfied
 }
 
 fn main() {