---

yaml
---
r: 276156
b: refs/heads/master
c: 8013eeb
h: refs/heads/master

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1067850e6a8664eaabd59c3893aa5a762bdf2339
+refs/heads/master: 8013eebf2c77b7756b6a99aee2c38ef417c60e19
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
 refs/heads/try: 49312a405e14a449b98fe0056b12a40ac128be4a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/librustc_driver/test.rs

@@ -73,6 +73,7 @@ fn remove_message(e: &mut ExpectErrorEmitter, msg: &str, lvl: Level) {
             e.messages.remove(i);
         }
         None => {
+            debug!("Unexpected error: {} Expected: {:?}", msg, e.messages);
             panic!("Unexpected error: {} Expected: {:?}", msg, e.messages);
         }
     }
@@ -446,7 +447,7 @@ fn contravariant_region_ptr_ok() {
 
 #[test]
 fn contravariant_region_ptr_err() {
-    test_env(EMPTY_SOURCE_STR, errors(&["lifetime mismatch"]), |env| {
+    test_env(EMPTY_SOURCE_STR, errors(&["mismatched types"]), |env| {
         env.create_simple_region_hierarchy();
         let t_rptr1 = env.t_rptr_scope(1);
         let t_rptr10 = env.t_rptr_scope(10);