Skip to content

Commit 63dbfb3

Browse files
Start of moving some functionality to separate files
1 parent 7467d17 commit 63dbfb3

File tree

2 files changed

+34
-26
lines changed

2 files changed

+34
-26
lines changed

compiler/rustc_typeck/src/check/mod.rs

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// ignore-tidy-filelength
2-
31
/*!
42
53
# typeck: check phase
@@ -82,6 +80,7 @@ mod pat;
8280
mod place_op;
8381
mod regionck;
8482
mod upvar;
83+
mod util;
8584
mod wfcheck;
8685
pub mod writeback;
8786

@@ -97,7 +96,7 @@ use rustc_errors::ErrorReported;
9796
use rustc_errors::{pluralize, struct_span_err, Applicability, DiagnosticBuilder, DiagnosticId};
9897
use rustc_hir as hir;
9998
use rustc_hir::def::{CtorOf, DefKind, Res};
100-
use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, LocalDefId, LOCAL_CRATE};
99+
use rustc_hir::def_id::{DefId, DefIdMap, LocalDefId, LOCAL_CRATE};
101100
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
102101
use rustc_hir::itemlikevisit::ItemLikeVisitor;
103102
use rustc_hir::lang_items::LangItem;
@@ -738,31 +737,12 @@ pub fn check_wf_new(tcx: TyCtxt<'_>) {
738737
tcx.hir().krate().par_visit_all_item_likes(&visit);
739738
}
740739

741-
fn check_mod_item_types(tcx: TyCtxt<'_>, module_def_id: LocalDefId) {
742-
tcx.hir().visit_item_likes_in_module(module_def_id, &mut CheckItemTypesVisitor { tcx });
743-
}
744-
745-
fn typeck_item_bodies(tcx: TyCtxt<'_>, crate_num: CrateNum) {
746-
debug_assert!(crate_num == LOCAL_CRATE);
747-
tcx.par_body_owners(|body_owner_def_id| {
748-
tcx.ensure().typeck(body_owner_def_id);
749-
});
750-
}
751-
752-
fn check_item_well_formed(tcx: TyCtxt<'_>, def_id: LocalDefId) {
753-
wfcheck::check_item_well_formed(tcx, def_id);
754-
}
755-
756-
fn check_trait_item_well_formed(tcx: TyCtxt<'_>, def_id: LocalDefId) {
757-
wfcheck::check_trait_item(tcx, def_id);
758-
}
759-
760-
fn check_impl_item_well_formed(tcx: TyCtxt<'_>, def_id: LocalDefId) {
761-
wfcheck::check_impl_item(tcx, def_id);
762-
}
763-
764740
pub fn provide(providers: &mut Providers) {
765741
method::provide(providers);
742+
use util::{
743+
check_impl_item_well_formed, check_item_well_formed, check_mod_item_types,
744+
check_trait_item_well_formed, typeck_item_bodies,
745+
};
766746
*providers = Providers {
767747
typeck_item_bodies,
768748
typeck_const_arg,
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
use rustc_hir::def_id::{CrateNum, LocalDefId, LOCAL_CRATE};
2+
3+
use crate::TyCtxt;
4+
use super::wfcheck;
5+
use crate::check::CheckItemTypesVisitor;
6+
7+
pub fn check_mod_item_types(tcx: TyCtxt<'_>, module_def_id: LocalDefId) {
8+
tcx.hir().visit_item_likes_in_module(module_def_id, &mut CheckItemTypesVisitor { tcx });
9+
}
10+
11+
pub fn check_item_well_formed(tcx: TyCtxt<'_>, def_id: LocalDefId) {
12+
wfcheck::check_item_well_formed(tcx, def_id);
13+
}
14+
15+
pub fn check_trait_item_well_formed(tcx: TyCtxt<'_>, def_id: LocalDefId) {
16+
wfcheck::check_trait_item(tcx, def_id);
17+
}
18+
19+
pub fn check_impl_item_well_formed(tcx: TyCtxt<'_>, def_id: LocalDefId) {
20+
wfcheck::check_impl_item(tcx, def_id);
21+
}
22+
23+
pub fn typeck_item_bodies(tcx: TyCtxt<'_>, crate_num: CrateNum) {
24+
debug_assert!(crate_num == LOCAL_CRATE);
25+
tcx.par_body_owners(|body_owner_def_id| {
26+
tcx.ensure().typeck(body_owner_def_id);
27+
});
28+
}

0 commit comments

Comments
 (0)