From fc7693d63b2f3736b7d847c8c3d9c7219c4bea4a Mon Sep 17 00:00:00 2001
From: Michael Goulet <michael@errs.io>
Date: Mon, 12 Feb 2024 04:51:21 +0000
Subject: [PATCH] Clean inlined type alias with correct param-env
---
src/librustdoc/clean/mod.rs | 4 +++-
.../rustdoc-ui/normalize-in-inlined-type-alias.rs | 14 ++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 tests/rustdoc-ui/normalize-in-inlined-type-alias.rs
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index 89977934cde9f..abd0b3562d211 100644
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -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 {
diff --git a/tests/rustdoc-ui/normalize-in-inlined-type-alias.rs b/tests/rustdoc-ui/normalize-in-inlined-type-alias.rs
new file mode 100644
index 0000000000000..45e04a70c0913
--- /dev/null
+++ b/tests/rustdoc-ui/normalize-in-inlined-type-alias.rs
@@ -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> {}