Skip to content

Commit e924357

Browse files
committed
Remove the last redundant check from kindck, and then remove the pass as well.
1 parent 2ec305d commit e924357

File tree

4 files changed

+7
-106
lines changed

4 files changed

+7
-106
lines changed

src/librustc/diagnostics.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ register_diagnostics!(
146146
E0139,
147147
E0140,
148148
E0141,
149-
E0144,
150149
E0152,
151150
E0153,
152151
E0154,

src/librustc/driver/driver.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use lint;
1717
use llvm::{ContextRef, ModuleRef};
1818
use metadata::common::LinkMeta;
1919
use metadata::creader;
20-
use middle::{trans, stability, kind, ty, typeck, reachable};
20+
use middle::{trans, stability, ty, typeck, reachable};
2121
use middle::dependency_format;
2222
use middle;
2323
use plugin::load::Plugins;
@@ -462,8 +462,12 @@ pub fn phase_3_run_analysis_passes<'tcx>(sess: Session,
462462
time(time_passes, "rvalue checking", (), |_|
463463
middle::check_rvalues::check_crate(&ty_cx, krate));
464464

465-
time(time_passes, "kind checking", (), |_|
466-
kind::check_crate(&ty_cx));
465+
// Avoid overwhelming user with errors if type checking failed.
466+
// I'm not sure how helpful this is, to be honest, but it avoids a
467+
// lot of annoying errors in the compile-fail tests (basically,
468+
// lint warnings and so on -- kindck used to do this abort, but
469+
// kindck is gone now). -nmatsakis
470+
ty_cx.sess.abort_if_errors();
467471

468472
let reachable_map =
469473
time(time_passes, "reachability checking", (), |_|

src/librustc/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ pub mod middle {
9595
pub mod expr_use_visitor;
9696
pub mod graph;
9797
pub mod intrinsicck;
98-
pub mod kind;
9998
pub mod lang_items;
10099
pub mod liveness;
101100
pub mod mem_categorization;

src/librustc/middle/kind.rs

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)