Skip to content

Commit

Permalink
Rollup merge of rust-lang#111448 - compiler-errors:rustdoc-alias-impl…
Browse files Browse the repository at this point in the history
…, r=notriddle

Use proper impl self type for alias impl in rustdoc

We don't want to use `type_of(type_alias)`, we want to use `type_of(impl)` -- this will give us the self type of the impl *properly substituted* in the case that it's an alias.

Fixes rust-lang#111420
  • Loading branch information
matthiaskrgr authored May 11, 2023
2 parents 968911d + 6509c42 commit 07af55e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 8 deletions.
17 changes: 9 additions & 8 deletions src/librustdoc/clean/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2414,14 +2414,15 @@ fn clean_impl<'tcx>(
}

let for_ = clean_ty(impl_.self_ty, cx);
let type_alias = for_.def_id(&cx.cache).and_then(|did| match tcx.def_kind(did) {
DefKind::TyAlias => Some(clean_middle_ty(
ty::Binder::dummy(tcx.type_of(did).subst_identity()),
cx,
Some(did),
)),
_ => None,
});
let type_alias =
for_.def_id(&cx.cache).and_then(|alias_def_id: DefId| match tcx.def_kind(alias_def_id) {
DefKind::TyAlias => Some(clean_middle_ty(
ty::Binder::dummy(tcx.type_of(def_id).subst_identity()),
cx,
Some(def_id.to_def_id()),
)),
_ => None,
});
let mut make_item = |trait_: Option<Path>, for_: Type, items: Vec<Item>| {
let kind = ImplItem(Box::new(Impl {
unsafety: impl_.unsafety,
Expand Down
9 changes: 9 additions & 0 deletions tests/rustdoc/impl-alias-substituted.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
pub struct Matrix<T, const N: usize, const M: usize>([[T; N]; M]);

pub type Vector<T, const N: usize> = Matrix<T, N, 1>;

// @has "impl_alias_substituted/struct.Matrix.html" '//*[@class="impl"]//h3[@class="code-header"]' \
// "impl<T: Copy> Matrix<T, 3, 1>"
impl<T: Copy> Vector<T, 3> {
pub fn test() {}
}

0 comments on commit 07af55e

Please sign in to comment.