Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #155063 - josetorrs:refactor-alias-free, r=WaffleLapkin

Browse Source 
`ty::Alias`: replace `def_id: did` with `def_id`

related issue: https://github.com/rust-lang/rust/issues/154941

tackling this task:

- [x] replace def_id: did with def_id where possible

r? @WaffleLapkin
This commit is contained in:
Jonathan Brouwer
2026-04-11 20:58:37 +02:00
committed by GitHub
parent 9a24dbf885 ec582d5c1b
commit 58ca4df0bd
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs
+6 -6
View File
@@ -1134,22 +1134,22 @@ fn probe_trait_that_defines_assoc_item(
fn lower_path_segment(
&self,
span: Span,
did: DefId,
def_id: DefId,
item_segment: &hir::PathSegment<'tcx>,
) -> Ty<'tcx> {
let tcx = self.tcx();
let args = self.lower_generic_args_of_path_segment(span, did, item_segment);
let args = self.lower_generic_args_of_path_segment(span, def_id, item_segment);
if let DefKind::TyAlias = tcx.def_kind(did)
&& tcx.type_alias_is_lazy(did)
if let DefKind::TyAlias = tcx.def_kind(def_id)
&& tcx.type_alias_is_lazy(def_id)
{
// Type aliases defined in crates that have the
// feature `lazy_type_alias` enabled get encoded as a type alias that normalization will
// then actually instantiate the where bounds of.
let alias_ty = ty::AliasTy::new_from_args(tcx, ty::Free { def_id: did }, args);
let alias_ty = ty::AliasTy::new_from_args(tcx, ty::Free { def_id }, args);
Ty::new_alias(tcx, alias_ty)
} else {
tcx.at(span).type_of(did).instantiate(tcx, args)
tcx.at(span).type_of(def_id).instantiate(tcx, args)
}
}