---

nikomatsakis · nikomatsakis · commit fd00f4b84c2d · 2015-07-06T10:06:18.000-04:00
yaml --- r: 226117 b: refs/heads/stable c: db75b07 h: refs/heads/master i: 226115: a0e1c85 v: v3
diff --git a/[refs] b/[refs]
@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 9cdaa1fc25f8228b2b62e7f755f98f5344a6b4d4
+refs/heads/stable: db75b07d594d381116739e9045421523ae26dca3
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
diff --git a/branches/stable/src/test/compile-fail/object-lifetime-default-elision.rs b/branches/stable/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/branches/stable/src/test/compile-fail/object-lifetime-default-mybox.rs b/branches/stable/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() {
 }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ fn load0<'a>(ss: &'a Box<SomeTrait>) -> Box<SomeTrait> {`
`41`	`41`
`42`	`42`	`deref(ss)`
`43`	`43`	`//~^ ERROR cannot infer`
`44`		`- //~\| WARNING E0398`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`fn load1(ss: &SomeTrait) -> &SomeTrait {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ fn deref<T>(ss: &T) -> T {`
`28`	`28`
`29`	`29`	`fn load0(ss: &MyBox<SomeTrait>) -> MyBox<SomeTrait> {`
`30`	`30`	`deref(ss) //~ ERROR cannot infer`
`31`		`- //~^ WARNING E0398`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`fn load1<'a,'b>(a: &'a MyBox<SomeTrait>,`
`@@ -40,5 +39,9 @@ fn load1<'a,'b>(a: &'a MyBox<SomeTrait>,`
`40`	`39`	`//~\| ERROR mismatched types`
`41`	`40`	`}`
`42`	`41`
	`42`	`+fn load2<'a>(ss: &MyBox<SomeTrait+'a>) -> MyBox<SomeTrait+'a> {`
	`43`	`+ load0(ss) //~ WARNING E0398`
	`44`	`+}`
	`45`	`+`
`43`	`46`	`fn main() {`
`44`	`47`	`}`