languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-10-16 13:34:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only compute DefKind through the query.

Browse source
This commit is contained in:
Camille GILLOT 2022-04-29 19:43:15 +02:00
parent 9a6fa4f118
commit e3d63203a3
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_middle/src/hir/map/mod.rs
View file

@ -225,7 +225,8 @@ pub fn iter_local_def_id(self) -> impl Iterator<Item = LocalDefId> + 'hir {
self.tcx.definitions_untracked().iter_local_def_id()
}
pub fn opt_def_kind(self, local_def_id: LocalDefId) -> Option<DefKind> {
/// Do not call this function directly. The query should be called.
pub(super) fn opt_def_kind(self, local_def_id: LocalDefId) -> Option<DefKind> {
let hir_id = self.local_def_id_to_hir_id(local_def_id);
let def_kind = match self.find(hir_id)? {
Node::Item(item) => match item.kind {

2
compiler/rustc_privacy/src/lib.rs
View file

@ -467,7 +467,7 @@ fn update_reachability_from_macro(&mut self, local_def_id: LocalDefId, md: &Macr
}
let macro_module_def_id = self.tcx.local_parent(local_def_id);
if self.tcx.hir().opt_def_kind(macro_module_def_id) != Some(DefKind::Mod) {
if self.tcx.opt_def_kind(macro_module_def_id) != Some(DefKind::Mod) {
// The macro's parent doesn't correspond to a `mod`, return early (#63164, #65252).
return;
}

2
compiler/rustc_query_impl/src/plumbing.rs
View file

@ -291,7 +291,7 @@ pub fn $name<$tcx>(tcx: QueryCtxt<$tcx>, key: query_keys::$name<$tcx>) -> QueryS
// accidentally triggering an infinite query loop.
let def_kind = key.key_as_def_id()
.and_then(|def_id| def_id.as_local())
.and_then(|def_id| tcx.hir().opt_def_kind(def_id));
.map(|def_id| tcx.def_kind(def_id));
let hash = || {
let mut hcx = tcx.create_stable_hashing_context();
let mut hasher = StableHasher::new();