---

yaml
---
r: 41595
b: refs/heads/master
c: d771830
h: refs/heads/master
i:
  41593: 48869a5
  41591: 6df4351
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e45312e5a0557b2d79028bd5f869f979bc2b5924
+refs/heads/master: d771830c4ca2ef63b41c9f871b84868a1d330c81
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/librustc/middle/typeck/infer/mod.rs

@@ -737,15 +737,16 @@ impl infer_ctxt {
     fn type_error_message(sp: span, mk_msg: fn(~str) -> ~str,
                           actual_ty: ty::t, err: Option<&ty::type_err>) {
         let actual_ty = self.resolve_type_vars_if_possible(actual_ty);
+        let mut actual_sty = ty::get(copy actual_ty);
 
         // Don't report an error if actual type is ty_err.
-        match ty::get(actual_ty).sty {
+        match actual_sty.sty {
             ty::ty_err => return,
             // Should really not report an error if the type
             // has ty_err anywhere as a component, but that's
             // annoying since we haven't written a visitor for
             // ty::t yet
-            ty::ty_fn(fty) => match ty::get(fty.sig.output).sty {
+            ty::ty_fn(ref fty) => match ty::get(fty.sig.output).sty {
                 ty::ty_err => return,
                 _ => ()
             },

trunk/src/test/compile-fail/fully-qualified-type-name3.rs

@@ -10,6 +10,7 @@
 
 // Test that we use fully-qualified type names in error messages.
 
+// xfail-test
 type T1 = uint;
 type T2 = int;
 

trunk/src/test/compile-fail/pptypedef.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test
 type foo = Option<int>;
 
 fn bar(_t: foo) {}

trunk/src/test/compile-fail/unsafe-fn-autoderef.rs

@@ -9,7 +9,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
+// xfail-test
 type rec = {f: int};
 fn f(p: *rec) -> int {