---

nikomatsakis · nikomatsakis · commit d5e77146e8ee · 2015-07-03T19:42:35.000-04:00
yaml --- r: 219807 b: refs/heads/snap-stage3 c: 65a456d h: refs/heads/master i: 219805: ff0c068 219803: e1f7646 219799: 8084d6f 219791: d0db3f5 219775: 72fb585 v: v3
diff --git a/[refs] b/[refs]
@@ -1,6 +1,6 @@
 ---
 refs/heads/master: c044791d80ea0dc5c4b57b6030a67b69f8510239
-refs/heads/snap-stage3: 18e9007ac249c542aa3b73b5aa275e52825ca940
+refs/heads/snap-stage3: 65a456df430260cc4c0a8ef189b764c34153d435
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/snap-stage3/src/test/compile-fail/object-lifetime-default-elision.rs b/branches/snap-stage3/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/snap-stage3/src/test/compile-fail/object-lifetime-default-mybox.rs b/branches/snap-stage3/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`	`}`