Skip to content
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.

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

rustdoc: synthetic auto trait impls: accept unresolved region vars for now #123375

Merged
merged 1 commit into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion src/librustdoc/clean/auto_trait.rs
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,14 @@ fn clean_param_env<'tcx>(
})
.map(|pred| {
tcx.fold_regions(pred, |r, _| match *r {
ty::ReVar(vid) => vid_to_region[&vid],
// FIXME: Don't `unwrap_or`, I think we should panic if we encounter an infer var that
// we can't map to a concrete region. However, `AutoTraitFinder` *does* leak those kinds
// of `ReVar`s for some reason at the time of writing. See `rustdoc-ui/` tests.
// This is in dire need of an investigation into `AutoTraitFinder`.
ty::ReVar(vid) => vid_to_region.get(&vid).copied().unwrap_or(r),
ty::ReEarlyParam(_) | ty::ReStatic | ty::ReBound(..) | ty::ReError(_) => r,
// FIXME(#120606): `AutoTraitFinder` can actually leak placeholder regions which feels
// incorrect. Needs investigation.
ty::ReLateParam(_) | ty::RePlaceholder(_) | ty::ReErased => {
bug!("unexpected region kind: {r:?}")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// We used to ICE here while trying to synthesize auto trait impls.
// issue: 112242
//@ check-pass
//@ compile-flags: -Znormalize-docs

pub trait MyTrait<'a> {
type MyItem;
}
pub struct Inner<Q>(Q);
pub struct Outer<Q>(Inner<Q>);

impl<'a, Q> std::marker::Unpin for Inner<Q>
where
Q: MyTrait<'a>,
<Q as MyTrait<'a>>::MyItem: Copy,
{
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// We used to ICE here while trying to synthesize auto trait impls.
// issue: 123370
//@ check-pass

pub struct Inner<'a, Q>(&'a (), Q);

pub struct Outer<'a, Q>(Inner<'a, Q>);

impl<'a, Q: Trait<'a>> std::marker::Unpin for Inner<'static, Q> {}

pub trait Trait<'a> {}
Loading