1
Fork 0

xfail broken tests

This commit is contained in:
Tim Chevalier 2013-01-07 17:49:10 -08:00
parent e45312e5a0
commit d771830c4c
4 changed files with 6 additions and 3 deletions

View file

@ -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,
_ => ()
},

View file

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

View file

@ -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) {}

View file

@ -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 {