---

yaml
---
r: 235119
b: refs/heads/stable
c: 18e9007
h: refs/heads/master
i:
  235117: 7d20cc7
  235115: 9cc6ac9
  235111: 875bacf
  235103: 9154f88
v: v3

Author: nikomatsakis

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 1e7a6b880c84176a11525e7be5b5a9b15f8143b1
+refs/heads/stable: 18e9007ac249c542aa3b73b5aa275e52825ca940
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/test/compile-fail/issue-24446.rs

@@ -11,7 +11,7 @@
 fn main() {
     static foo: Fn() -> u32 = || -> u32 {
         //~^ ERROR: mismatched types:
-        //~| expected `core::ops::Fn() -> u32`,
+        //~| expected `core::ops::Fn() -> u32 + 'static`,
         //~| found closure
         //~| (expected trait core::ops::Fn,
         //~| found closure)

branches/stable/src/test/compile-fail/object-lifetime-default-elision.rs

@@ -41,6 +41,7 @@ fn load0<'a>(ss: &'a Box<SomeTrait>) -> Box<SomeTrait> {
 
     deref(ss)
         //~^ ERROR cannot infer
+        //~| WARNING E0398
 }
 
 fn load1(ss: &SomeTrait) -> &SomeTrait {

branches/stable/src/test/compile-fail/object-lifetime-default-mybox.rs

@@ -28,6 +28,7 @@ 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>,

branches/stable/src/test/compile-fail/object-lifetime-default.rs

@@ -11,10 +11,10 @@
 #![feature(rustc_attrs)]
 
 #[rustc_object_lifetime_default]
-struct A<T>(T); //~ ERROR None
+struct A<T>(T); //~ ERROR BaseDefault
 
 #[rustc_object_lifetime_default]
-struct B<'a,T>(&'a (), T); //~ ERROR None
+struct B<'a,T>(&'a (), T); //~ ERROR BaseDefault
 
 #[rustc_object_lifetime_default]
 struct C<'a,T:'a>(&'a T); //~ ERROR 'a

branches/stable/src/test/compile-fail/trait-bounds-cant-coerce.rs

@@ -22,8 +22,8 @@ fn c(x: Box<Foo+Sync+Send>) {
 
 fn d(x: Box<Foo>) {
     a(x); //~  ERROR mismatched types
-          //~| expected `Box<Foo + Send>`
-          //~| found `Box<Foo>`
+          //~| expected `Box<Foo + Send + 'static>`
+          //~| found `Box<Foo + 'static>`
           //~| expected bounds `Send`
           //~| found no bounds
 }

branches/stable/src/test/run-pass/issue-21058.rs

@@ -26,5 +26,5 @@ fn main() {
         std::intrinsics::type_name::<NT>(),
         // DST
         std::intrinsics::type_name::<DST>()
-    )}, ("[u8]", "str", "core::marker::Copy", "NT", "DST"));
+    )}, ("[u8]", "str", "core::marker::Copy + 'static", "NT", "DST"));
 }