From 474872160a49e4048e5017f0bbb8d93d19267b9a Mon Sep 17 00:00:00 2001
From: Eduard Burtescu <edy.burt@gmail.com>
Date: Thu, 8 Jan 2015 18:39:17 +0200
Subject: [PATCH] tests: update some compile-fail tests for the new behavior of
 type expectations.

---
 src/test/compile-fail/issue-15783.rs                      | 3 ++-
 src/test/compile-fail/regions-early-bound-error-method.rs | 2 ++
 src/test/compile-fail/regions-early-bound-error.rs        | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/compile-fail/issue-15783.rs b/src/test/compile-fail/issue-15783.rs
index 1b1b0302383..d363f2f834b 100644
--- a/src/test/compile-fail/issue-15783.rs
+++ b/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);
 }
diff --git a/src/test/compile-fail/regions-early-bound-error-method.rs b/src/test/compile-fail/regions-early-bound-error-method.rs
index 9de0ed070c7..c83fb096512 100644
--- a/src/test/compile-fail/regions-early-bound-error-method.rs
+++ b/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)
+
     }
 }
 
diff --git a/src/test/compile-fail/regions-early-bound-error.rs b/src/test/compile-fail/regions-early-bound-error.rs
index 37b74aea539..cc6acdca78e 100644
--- a/src/test/compile-fail/regions-early-bound-error.rs
+++ b/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() {