---

yaml
---
r: 52143
b: refs/heads/dist-snap
c: d771830
h: refs/heads/master
i:
  52141: 01fe4d5
  52139: 6eed19c
  52135: 9b666b7
  52127: b8c9d96
v: v3

Author: catamorphism

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: e45312e5a0557b2d79028bd5f869f979bc2b5924
+refs/heads/dist-snap: d771830c4ca2ef63b41c9f871b84868a1d330c81
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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,
                 _ => ()
             },

branches/dist-snap/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;
 

branches/dist-snap/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) {}

branches/dist-snap/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 {