bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Delegation: support generics for delegation from free functions

Browse source
This commit is contained in:
Bryanskiy 2024-05-30 22:00:44 +03:00
parent 80d8270d84
commit f2f9aab380
24 changed files with 702 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -746,6 +746,21 @@ impl<'hir> Map<'hir> {
}
}
pub fn opt_delegation_sig_id(self, def_id: LocalDefId) -> Option<DefId> {
if let Some(ret) = self.get_fn_output(def_id)
&& let FnRetTy::Return(ty) = ret
&& let TyKind::InferDelegation(sig_id, _) = ty.kind
{
return Some(sig_id);
}
None
}
#[inline]
pub fn delegation_sig_id(self, def_id: LocalDefId) -> DefId {
self.opt_delegation_sig_id(def_id).unwrap()
}
#[inline]
fn opt_ident(self, id: HirId) -> Option<Ident> {
match self.tcx.hir_node(id) {

4
compiler/rustc_middle/src/query/mod.rs
View file

@ -1722,6 +1722,10 @@ rustc_queries! {
desc { |tcx| "getting the native library for `{}`", tcx.def_path_str(def_id) }
}
query inherit_sig_for_delegation_item(def_id: LocalDefId) -> &'tcx [Ty<'tcx>] {
desc { "inheriting delegation signature" }
}
/// Does lifetime resolution on items. Importantly, we can't resolve
/// lifetimes directly on things like trait methods, because of trait params.
/// See `rustc_resolve::late::lifetimes` for details.