Skip to content

Commit 2c71ad4

Browse files
committed
Use () for typeck_item_bodies.
1 parent 837f3e3 commit 2c71ad4

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

compiler/rustc_middle/src/query/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ rustc_queries! {
681681
desc { |tcx| "computing CoerceUnsized info for `{}`", tcx.def_path_str(key) }
682682
}
683683

684-
query typeck_item_bodies(_: CrateNum) -> () {
684+
query typeck_item_bodies(_: ()) -> () {
685685
desc { "type-checking all item bodies" }
686686
}
687687

compiler/rustc_typeck/src/check/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet};
105105
use rustc_errors::{pluralize, struct_span_err, Applicability};
106106
use rustc_hir as hir;
107107
use rustc_hir::def::Res;
108-
use rustc_hir::def_id::{CrateNum, DefId, LocalDefId, LOCAL_CRATE};
108+
use rustc_hir::def_id::{DefId, LocalDefId};
109109
use rustc_hir::intravisit::Visitor;
110110
use rustc_hir::itemlikevisit::ItemLikeVisitor;
111111
use rustc_hir::{HirIdMap, ImplicitSelfKind, Node};
@@ -1161,8 +1161,7 @@ impl ItemLikeVisitor<'tcx> for CheckItemTypesVisitor<'tcx> {
11611161
fn visit_foreign_item(&mut self, _: &'tcx hir::ForeignItem<'tcx>) {}
11621162
}
11631163

1164-
fn typeck_item_bodies(tcx: TyCtxt<'_>, crate_num: CrateNum) {
1165-
debug_assert!(crate_num == LOCAL_CRATE);
1164+
fn typeck_item_bodies(tcx: TyCtxt<'_>, (): ()) {
11661165
tcx.par_body_owners(|body_owner_def_id| {
11671166
tcx.ensure().typeck(body_owner_def_id);
11681167
});

compiler/rustc_typeck/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ mod variance;
9797

9898
use rustc_errors::{struct_span_err, ErrorReported};
9999
use rustc_hir as hir;
100-
use rustc_hir::def_id::{DefId, LOCAL_CRATE};
100+
use rustc_hir::def_id::DefId;
101101
use rustc_hir::{Node, CRATE_HIR_ID};
102102
use rustc_infer::infer::{InferOk, TyCtxtInferExt};
103103
use rustc_infer::traits::TraitEngineExt as _;
@@ -510,7 +510,7 @@ pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorReported> {
510510
}
511511
});
512512

513-
tcx.sess.time("item_bodies_checking", || tcx.typeck_item_bodies(LOCAL_CRATE));
513+
tcx.sess.time("item_bodies_checking", || tcx.typeck_item_bodies(()));
514514

515515
check_unused::check_crate(tcx);
516516
check_for_entry_fn(tcx);

0 commit comments

Comments
 (0)