Skip to content

Clean inlined type alias with correct param-env #120956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2024
Merged

Clean inlined type alias with correct param-env #120956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/librustdoc/clean/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1840,7 +1840,9 @@ fn maybe_expand_private_type_alias<'tcx>(
}
}

Some(cx.enter_alias(args, def_id.to_def_id(), |cx| clean_ty(&ty, cx)))
Some(cx.enter_alias(args, def_id.to_def_id(), |cx| {
cx.with_param_env(def_id.to_def_id(), |cx| clean_ty(&ty, cx))
}))
}

pub(crate) fn clean_ty<'tcx>(ty: &hir::Ty<'tcx>, cx: &mut DocContext<'tcx>) -> Type {
Expand Down
14 changes: 14 additions & 0 deletions tests/rustdoc-ui/normalize-in-inlined-type-alias.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// check-pass
// compile-flags: -Znormalize-docs

trait Woo<T> {
type Assoc;
}

impl<T> Woo<T> for () {
type Assoc = ();
}

type Alias<P> = <() as Woo<P>>::Assoc;

pub fn hello<S>() -> Alias<S> {}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Specifically, here we were trying to normalize <() as Woo<P>>::Assoc (the type of Alias<P>) in a param-env that was [S: Sized].