Skip to content

Commit 86db69d

Browse files
committed
Revert "xfail broken tests"
This reverts commit d771830.
1 parent d771830 commit 86db69d

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -737,16 +737,15 @@ 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);
741740

742741
// Don't report an error if actual type is ty_err.
743-
match actual_sty.sty {
742+
match ty::get(actual_ty).sty {
744743
ty::ty_err => return,
745744
// Should really not report an error if the type
746745
// has ty_err anywhere as a component, but that's
747746
// annoying since we haven't written a visitor for
748747
// ty::t yet
749-
ty::ty_fn(ref fty) => match ty::get(fty.sig.output).sty {
748+
ty::ty_fn(fty) => match ty::get(fty.sig.output).sty {
750749
ty::ty_err => return,
751750
_ => ()
752751
},

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

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

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

13-
// xfail-test
1413
type T1 = uint;
1514
type T2 = int;
1615

src/test/compile-fail/pptypedef.rs

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

11-
// xfail-test
1211
type foo = Option<int>;
1312

1413
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-
// xfail-test
12+
1313
type rec = {f: int};
1414
fn f(p: *rec) -> int {
1515

0 commit comments

Comments
 (0)