Skip to content

Commit 7c1c0e6

Browse files
Collect trait impls inside unnamed consts
1 parent f04f38d commit 7c1c0e6

File tree

3 files changed

+61
-19
lines changed

3 files changed

+61
-19
lines changed

crates/hir_def/src/item_scope.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ impl ItemScope {
107107
.map(|(_, v)| v)
108108
}
109109

110+
pub fn unnamed_consts(&self) -> impl Iterator<Item = ConstId> + '_ {
111+
self.unnamed_consts.iter().copied()
112+
}
113+
110114
/// Iterate over all module scoped macros
111115
pub(crate) fn macros<'a>(&'a self) -> impl Iterator<Item = (&'a Name, MacroDefId)> + 'a {
112116
self.entries().filter_map(|(name, def)| def.take_macros().map(|macro_| (name, macro_)))

crates/hir_ty/src/method_resolution.rs

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use arrayvec::ArrayVec;
88
use base_db::CrateId;
99
use chalk_ir::{cast::Cast, Mutability, UniverseIndex};
1010
use hir_def::{
11-
lang_item::LangItemTarget, AssocContainerId, AssocItemId, FunctionId, GenericDefId, HasModule,
12-
ImplId, Lookup, ModuleId, TraitId,
11+
lang_item::LangItemTarget, nameres::DefMap, AssocContainerId, AssocItemId, FunctionId,
12+
GenericDefId, HasModule, ImplId, Lookup, ModuleId, TraitId,
1313
};
1414
use hir_expand::name::Name;
1515
use rustc_hash::{FxHashMap, FxHashSet};
@@ -100,25 +100,38 @@ impl TraitImpls {
100100
let mut impls = Self { map: FxHashMap::default() };
101101

102102
let crate_def_map = db.crate_def_map(krate);
103-
for (_module_id, module_data) in crate_def_map.modules() {
104-
for impl_id in module_data.scope.impls() {
105-
let target_trait = match db.impl_trait(impl_id) {
106-
Some(tr) => tr.skip_binders().hir_trait_id(),
107-
None => continue,
108-
};
109-
let self_ty = db.impl_self_ty(impl_id);
110-
let self_ty_fp = TyFingerprint::for_impl(self_ty.skip_binders());
111-
impls
112-
.map
113-
.entry(target_trait)
114-
.or_default()
115-
.entry(self_ty_fp)
116-
.or_default()
117-
.push(impl_id);
103+
collect_def_map(db, &crate_def_map, &mut impls);
104+
105+
return Arc::new(impls);
106+
107+
fn collect_def_map(db: &dyn HirDatabase, def_map: &DefMap, impls: &mut TraitImpls) {
108+
for (_module_id, module_data) in def_map.modules() {
109+
for impl_id in module_data.scope.impls() {
110+
let target_trait = match db.impl_trait(impl_id) {
111+
Some(tr) => tr.skip_binders().hir_trait_id(),
112+
None => continue,
113+
};
114+
let self_ty = db.impl_self_ty(impl_id);
115+
let self_ty_fp = TyFingerprint::for_impl(self_ty.skip_binders());
116+
impls
117+
.map
118+
.entry(target_trait)
119+
.or_default()
120+
.entry(self_ty_fp)
121+
.or_default()
122+
.push(impl_id);
123+
}
124+
125+
// To better support custom derives, collect impls in all unnamed const items.
126+
// const _: () = { ... };
127+
for konst in module_data.scope.unnamed_consts() {
128+
let body = db.body(konst.into());
129+
for (_, block_def_map) in body.blocks(db.upcast()) {
130+
collect_def_map(db, &block_def_map, impls);
131+
}
132+
}
118133
}
119134
}
120-
121-
Arc::new(impls)
122135
}
123136

124137
pub(crate) fn trait_impls_in_deps_query(db: &dyn HirDatabase, krate: CrateId) -> Arc<Self> {
@@ -208,6 +221,9 @@ impl InherentImpls {
208221
}
209222
}
210223

224+
// NOTE: We're not collecting inherent impls from unnamed consts here, we intentionally only
225+
// support trait impls there.
226+
211227
Arc::new(Self { map })
212228
}
213229

crates/hir_ty/src/tests/method_resolution.rs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,3 +1292,25 @@ mod b {
12921292
"#]],
12931293
)
12941294
}
1295+
1296+
#[test]
1297+
fn impl_in_unnamed_const() {
1298+
check_types(
1299+
r#"
1300+
struct S;
1301+
1302+
trait Tr {
1303+
fn method(&self) -> u16;
1304+
}
1305+
1306+
const _: () = {
1307+
impl Tr for S {}
1308+
};
1309+
1310+
fn f() {
1311+
S.method();
1312+
//^^^^^^^^^^ u16
1313+
}
1314+
"#,
1315+
);
1316+
}

0 commit comments

Comments
 (0)