---

nikomatsakis · nikomatsakis · commit 8f87adf889fa · 2015-07-03T19:42:35.000-04:00
yaml --- r: 223537 b: refs/heads/beta c: 65a456d h: refs/heads/master i: 223535: b4c500f v: v3
diff --git a/[refs] b/[refs]
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 18e9007ac249c542aa3b73b5aa275e52825ca940
+refs/heads/beta: 65a456df430260cc4c0a8ef189b764c34153d435
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
diff --git a/branches/beta/src/test/compile-fail/object-lifetime-default-elision.rs b/branches/beta/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/beta/src/test/compile-fail/object-lifetime-default-mybox.rs b/branches/beta/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`	`}`