Skip to content

Commit 3e77064

Browse files
Moved a struct only need by util into util
1 parent 6fd80e3 commit 3e77064

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

compiler/rustc_typeck/src/check/mod.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ use rustc_hir as hir;
9999
use rustc_hir::def::{CtorOf, DefKind, Res};
100100
use rustc_hir::def_id::{DefId, DefIdMap, LocalDefId, LOCAL_CRATE};
101101
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
102-
use rustc_hir::itemlikevisit::ItemLikeVisitor;
103102
use rustc_hir::lang_items::LangItem;
104103
use rustc_hir::{ExprKind, GenericArg, HirIdMap, ItemKind, Node, PatKind, QPath};
105104
use rustc_index::bit_set::BitSet;
@@ -695,18 +694,6 @@ impl Inherited<'a, 'tcx> {
695694
}
696695
}
697696

698-
struct CheckItemTypesVisitor<'tcx> {
699-
tcx: TyCtxt<'tcx>,
700-
}
701-
702-
impl ItemLikeVisitor<'tcx> for CheckItemTypesVisitor<'tcx> {
703-
fn visit_item(&mut self, i: &'tcx hir::Item<'tcx>) {
704-
check_item_type(self.tcx, i);
705-
}
706-
fn visit_trait_item(&mut self, _: &'tcx hir::TraitItem<'tcx>) {}
707-
fn visit_impl_item(&mut self, _: &'tcx hir::ImplItem<'tcx>) {}
708-
}
709-
710697
pub fn check_wf_new(tcx: TyCtxt<'_>) {
711698
let visit = wfcheck::CheckTypeWellFormedVisitor::new(tcx);
712699
tcx.hir().krate().par_visit_all_item_likes(&visit);

compiler/rustc_typeck/src/check/util.rs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
use rustc_hir as hir;
12
use rustc_hir::def_id::{CrateNum, LocalDefId, LOCAL_CRATE};
3+
use rustc_hir::itemlikevisit::ItemLikeVisitor;
24

35
use std::cell::{Ref, RefCell, RefMut};
46

57
use super::wfcheck;
6-
use crate::check::CheckItemTypesVisitor;
78
use crate::{ty, TyCtxt};
89

910
/// A wrapper for `InferCtxt`'s `in_progress_typeck_results` field.
@@ -32,6 +33,18 @@ impl<'a, 'tcx> MaybeInProgressTables<'a, 'tcx> {
3233
}
3334
}
3435

36+
struct CheckItemTypesVisitor<'tcx> {
37+
tcx: TyCtxt<'tcx>,
38+
}
39+
40+
impl ItemLikeVisitor<'tcx> for CheckItemTypesVisitor<'tcx> {
41+
fn visit_item(&mut self, i: &'tcx hir::Item<'tcx>) {
42+
super::check_item_type(self.tcx, i);
43+
}
44+
fn visit_trait_item(&mut self, _: &'tcx hir::TraitItem<'tcx>) {}
45+
fn visit_impl_item(&mut self, _: &'tcx hir::ImplItem<'tcx>) {}
46+
}
47+
3548
pub(super) fn check_mod_item_types(tcx: TyCtxt<'_>, module_def_id: LocalDefId) {
3649
tcx.hir().visit_item_likes_in_module(module_def_id, &mut CheckItemTypesVisitor { tcx });
3750
}

0 commit comments

Comments
 (0)