about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2015-06-17 14:11:58 -0400
committerNiko Matsakis <niko@alum.mit.edu>2015-07-03 19:42:35 -0400
commit65a456df430260cc4c0a8ef189b764c34153d435 (patch)
tree97973d5f8c472838b4c79262da60e7f05fcbf40a
parent18e9007ac249c542aa3b73b5aa275e52825ca940 (diff)
downloadrust-65a456df430260cc4c0a8ef189b764c34153d435.tar.gz
rust-65a456df430260cc4c0a8ef189b764c34153d435.zip
Now that I made the warning smarter, these tests no longer require modification
-rw-r--r--src/test/compile-fail/object-lifetime-default-elision.rs1
-rw-r--r--src/test/compile-fail/object-lifetime-default-mybox.rs5
2 files changed, 4 insertions, 2 deletions
diff --git a/src/test/compile-fail/object-lifetime-default-elision.rs b/src/test/compile-fail/object-lifetime-default-elision.rs
index 371acd24da0..75ee0bdc9c7 100644
--- a/src/test/compile-fail/object-lifetime-default-elision.rs
+++ b/src/test/compile-fail/object-lifetime-default-elision.rs
@@ -41,7 +41,6 @@ fn load0<'a>(ss: &'a Box<SomeTrait>) -> Box<SomeTrait> {
 
     deref(ss)
         //~^ ERROR cannot infer
-        //~| WARNING E0398
 }
 
 fn load1(ss: &SomeTrait) -> &SomeTrait {
diff --git a/src/test/compile-fail/object-lifetime-default-mybox.rs b/src/test/compile-fail/object-lifetime-default-mybox.rs
index c8fe197b92c..b5c4e0c767b 100644
--- a/src/test/compile-fail/object-lifetime-default-mybox.rs
+++ b/src/test/compile-fail/object-lifetime-default-mybox.rs
@@ -28,7 +28,6 @@ fn deref<T>(ss: &T) -> T {
 
 fn load0(ss: &MyBox<SomeTrait>) -> MyBox<SomeTrait> {
     deref(ss) //~ ERROR cannot infer
-        //~^ WARNING E0398
 }
 
 fn load1<'a,'b>(a: &'a MyBox<SomeTrait>,
@@ -40,5 +39,9 @@ fn load1<'a,'b>(a: &'a MyBox<SomeTrait>,
       //~| ERROR mismatched types
 }
 
+fn load2<'a>(ss: &MyBox<SomeTrait+'a>) -> MyBox<SomeTrait+'a> {
+    load0(ss) //~ WARNING E0398
+}
+
 fn main() {
 }