Thanks to visit codestin.com
Credit goes to github.com

Skip to content

convert higher ranked Predicates to PredicateKind::ForAll #73503

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 28 commits into from
Jul 27, 2020
Merged

convert higher ranked Predicates to PredicateKind::ForAll #73503

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
104cb87
add `PredicateKint`, because who doesn't like bodging
lcnr Jun 11, 2020
9a33b59
minimal
lcnr Jun 13, 2020
1b33f39
Handle trait/projection predicates with bound regions correctly
matthewjasper Jun 14, 2020
cd30894
anonymize_predicate
lcnr Jun 16, 2020
fb36c8b
query_outlives_constraints_into_obligations
lcnr Jun 17, 2020
c1d244f
convert trivial predicates
lcnr Jun 17, 2020
653f56a
wf
lcnr Jun 17, 2020
1fda8c2
somewhat related cleanup
lcnr Jun 17, 2020
7f39b0c
subst_supertrait
lcnr Jun 17, 2020
4c3b1e8
elaborate
lcnr Jun 18, 2020
506f430
progress
lcnr Jun 18, 2020
9852b42
`PredicateKint` -> `PredicateKind`, the beginning of the end
lcnr Jun 18, 2020
b79f7fb
rustdoc
lcnr Jun 19, 2020
8d4c99a
clippy
lcnr Jun 19, 2020
bbd581c
fix elaborate for predicates with unbound variables
lcnr Jun 19, 2020
c6c0d17
review
lcnr Jun 19, 2020
1151d62
split ignore_qualifiers
lcnr Jun 21, 2020
562d478
fix rustdoc
lcnr Jun 21, 2020
3ba6192
this might be unqualified, but at least it's now quantified
lcnr Jun 24, 2020
d030752
refactor query_outlives_constraints_into_obligations
lcnr Jun 24, 2020
52af82b
add reuse_or_mk_predicate
lcnr Jun 24, 2020
d8cf8ba
introduce PredicateAtom
lcnr Jul 8, 2020
cd9743b
directly contain `PredicateAtom` in `PredicateKind::ForAll`
lcnr Jul 18, 2020
825cb5b
fix rebase
lcnr Jul 18, 2020
072cc45
it works again :tada:
lcnr Jul 18, 2020
51cbcca
fix rustdoc
lcnr Jul 18, 2020
833b1d8
cleanup
lcnr Jul 21, 2020
602ef6b
clippy
lcnr Jul 27, 2020
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
Prev Previous commit
Next Next commit
fix rustdoc
  • Loading branch information
@lcnr
lcnr committed Jul 27, 2020
commit 51cbcca2eb1fe9e34742b932aeedbadd2ab745d5
38 changes: 14 additions & 24 deletions src/librustdoc/clean/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,12 +482,12 @@ impl<'a> Clean<Option<WherePredicate>> for ty::Predicate<'a> {
fn clean(&self, cx: &DocContext<'_>) -> Option<WherePredicate> {
match self.skip_binders() {
ty::PredicateAtom::Trait(pred, _) => Some(ty::Binder::bind(pred).clean(cx)),
ty::PredicateAtom::Subtype(pred) => Some(ty::Binder::bind(pred).clean(cx)),
ty::PredicateAtom::RegionOutlives(pred) => ty::Binder::bind(pred).clean(cx),
ty::PredicateAtom::TypeOutlives(pred) => ty::Binder::bind(pred).clean(cx),
ty::PredicateAtom::Projection(pred) => Some(ty::Binder::bind(pred).clean(cx)),
ty::PredicateAtom::RegionOutlives(pred) => pred.clean(cx),
ty::PredicateAtom::TypeOutlives(pred) => pred.clean(cx),
ty::PredicateAtom::Projection(pred) => Some(pred.clean(cx)),

ty::PredicateAtom::WellFormed(..)
ty::PredicateAtom::Subtype(..)
| ty::PredicateAtom::WellFormed(..)
| ty::PredicateAtom::ObjectSafe(..)
| ty::PredicateAtom::ClosureKind(..)
| ty::PredicateAtom::ConstEvaluatable(..)
Expand All @@ -506,20 +506,11 @@ impl<'a> Clean<WherePredicate> for ty::PolyTraitPredicate<'a> {
}
}

impl<'tcx> Clean<WherePredicate> for ty::PolySubtypePredicate<'tcx> {
fn clean(&self, _cx: &DocContext<'_>) -> WherePredicate {
panic!(
"subtype predicates are an internal rustc artifact \
and should not be seen by rustdoc"
)
}
}

impl<'tcx> Clean<Option<WherePredicate>>
for ty::PolyOutlivesPredicate<ty::Region<'tcx>, ty::Region<'tcx>>
for ty::OutlivesPredicate<ty::Region<'tcx>, ty::Region<'tcx>>
{
fn clean(&self, cx: &DocContext<'_>) -> Option<WherePredicate> {
let ty::OutlivesPredicate(a, b) = self.skip_binder();
let ty::OutlivesPredicate(a, b) = self;

if let (ty::ReEmpty(_), ty::ReEmpty(_)) = (a, b) {
return None;
Expand All @@ -532,9 +523,9 @@ impl<'tcx> Clean<Option<WherePredicate>>
}
}

impl<'tcx> Clean<Option<WherePredicate>> for ty::PolyOutlivesPredicate<Ty<'tcx>, ty::Region<'tcx>> {
impl<'tcx> Clean<Option<WherePredicate>> for ty::OutlivesPredicate<Ty<'tcx>, ty::Region<'tcx>> {
fn clean(&self, cx: &DocContext<'_>) -> Option<WherePredicate> {
let ty::OutlivesPredicate(ty, lt) = self.skip_binder();
let ty::OutlivesPredicate(ty, lt) = self;

if let ty::ReEmpty(_) = lt {
return None;
Expand All @@ -547,9 +538,9 @@ impl<'tcx> Clean<Option<WherePredicate>> for ty::PolyOutlivesPredicate<Ty<'tcx>,
}
}

impl<'tcx> Clean<WherePredicate> for ty::PolyProjectionPredicate<'tcx> {
impl<'tcx> Clean<WherePredicate> for ty::ProjectionPredicate<'tcx> {
fn clean(&self, cx: &DocContext<'_>) -> WherePredicate {
let ty::ProjectionPredicate { projection_ty, ty } = self.skip_binder();
let ty::ProjectionPredicate { projection_ty, ty } = self;
WherePredicate::EqPredicate { lhs: projection_ty.clean(cx), rhs: ty.clean(cx) }
}
}
Expand Down Expand Up @@ -1666,8 +1657,8 @@ impl<'tcx> Clean<Type> for Ty<'tcx> {
ty::PredicateAtom::Trait(tr, _constness) => {
ty::Binder::bind(tr.trait_ref)
}
ty::PredicateAtom::TypeOutlives(pred) => {
if let Some(r) = pred.1.clean(cx) {
ty::PredicateAtom::TypeOutlives(ty::OutlivesPredicate(_ty, reg)) => {
if let Some(r) = reg.clean(cx) {
regions.push(GenericBound::Outlives(r));
}
return None;
Expand All @@ -1686,9 +1677,8 @@ impl<'tcx> Clean<Type> for Ty<'tcx> {
.predicates
.iter()
.filter_map(|pred| {
// We never rebind `proj`, so `skip_binders_unchecked` is safe here.
if let ty::PredicateAtom::Projection(proj) =
pred.skip_binders_unchecked()
pred.bound_atom(cx.tcx).skip_binder()
{
if proj.projection_ty.trait_ref(cx.tcx)
== trait_ref.skip_binder()
Expand Down