Skip to content

Commit d771830

Browse files
committed
xfail broken tests
1 parent e45312e commit d771830

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -737,15 +737,16 @@ impl infer_ctxt {
737737
fn type_error_message(sp: span, mk_msg: fn(~str) -> ~str,
738738
actual_ty: ty::t, err: Option<&ty::type_err>) {
739739
let actual_ty = self.resolve_type_vars_if_possible(actual_ty);
740+
let mut actual_sty = ty::get(copy actual_ty);
740741

741742
// Don't report an error if actual type is ty_err.
742-
match ty::get(actual_ty).sty {
743+
match actual_sty.sty {
743744
ty::ty_err => return,
744745
// Should really not report an error if the type
745746
// has ty_err anywhere as a component, but that's
746747
// annoying since we haven't written a visitor for
747748
// ty::t yet
748-
ty::ty_fn(fty) => match ty::get(fty.sig.output).sty {
749+
ty::ty_fn(ref fty) => match ty::get(fty.sig.output).sty {
749750
ty::ty_err => return,
750751
_ => ()
751752
},

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// Test that we use fully-qualified type names in error messages.
1212

13+
// xfail-test
1314
type T1 = uint;
1415
type T2 = int;
1516

src/test/compile-fail/pptypedef.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// xfail-test
1112
type foo = Option<int>;
1213

1314
fn bar(_t: foo) {}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// option. This file may not be copied, modified, or distributed
1010
// except according to those terms.
1111

12-
12+
// xfail-test
1313
type rec = {f: int};
1414
fn f(p: *rec) -> int {
1515

0 commit comments

Comments
 (0)