---

yaml
---
r: 172407
b: refs/heads/master
c: 4748721
h: refs/heads/master
i:
  172405: 932b9d5
  172403: 6d24b99
  172399: c2c7633
v: v3

Author: eddyb

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e73fbc69cd85ccd7e444929b7b7aa0ae74ee6198
+refs/heads/master: 474872160a49e4048e5017f0bbb8d93d19267b9a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
 refs/heads/try: 705b92bdfe33d0d6febdf945340262514e1b3b5c

trunk/src/test/compile-fail/issue-15783.rs

@@ -14,7 +14,8 @@ pub fn foo(params: Option<&[&str]>) -> usize {
 
 fn main() {
     let name = "Foo";
-    let msg = foo(Some(&[name.as_slice()]));
+    let x = Some(&[name.as_slice()]);
+    let msg = foo(x);
 //~^ ERROR mismatched types: expected `core::option::Option<&[&str]>`
     assert_eq!(msg, 3);
 }

trunk/src/test/compile-fail/regions-early-bound-error-method.rs

@@ -28,6 +28,8 @@ impl<'a> GetRef<'a> for Box<'a> {
 impl<'a> Box<'a> {
     fn or<'b,G:GetRef<'b>>(&self, g2: G) -> &'a isize {
         g2.get() //~ ERROR cannot infer an appropriate lifetime for automatic coercion due to
+        //~^ ERROR mismatched types: expected `&'a isize`, found `&'b isize` (lifetime mismatch)
+
     }
 }
 

trunk/src/test/compile-fail/regions-early-bound-error.rs

@@ -27,6 +27,7 @@ impl<'a,T:Clone> GetRef<'a,T> for Box<'a,T> {
 
 fn get<'a,'b,G:GetRef<'a, isize>>(g1: G, b: &'b isize) -> &'b isize {
     g1.get() //~ ERROR cannot infer an appropriate lifetime for automatic coercion due to
+    //~^ ERROR mismatched types: expected `&'b isize`, found `&'a isize` (lifetime mismatch)
 }
 
 fn main() {