diff options
| author | Bastian Kauschke <bastian_kauschke@hotmail.de> | 2020-06-24 17:40:28 +0200 |
|---|---|---|
| committer | Bastian Kauschke <bastian_kauschke@hotmail.de> | 2020-07-27 21:06:36 +0200 |
| commit | 3ba61922d2500e156df7f76ffeccf022cdeb0f9a (patch) | |
| tree | 6f4c7a4823a0b5f107ae380e99a7adced8720bab /src/librustdoc | |
| parent | 562d4784215cb477c7fcec7c2c34df898d59c674 (diff) | |
this might be unqualified, but at least it's now quantified
Diffstat (limited to 'src/librustdoc')
| -rw-r--r-- | src/librustdoc/clean/auto_trait.rs | 4 | ||||
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 10 | ||||
| -rw-r--r-- | src/librustdoc/clean/simplify.rs | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/librustdoc/clean/auto_trait.rs b/src/librustdoc/clean/auto_trait.rs index d49afb551bd..498fa25836c 100644 --- a/src/librustdoc/clean/auto_trait.rs +++ b/src/librustdoc/clean/auto_trait.rs @@ -315,7 +315,7 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> { tcx: TyCtxt<'tcx>, pred: ty::Predicate<'tcx>, ) -> FxHashSet<GenericParamDef> { - let regions = match pred.ignore_qualifiers().skip_binder().kind() { + let regions = match pred.ignore_quantifiers().skip_binder().kind() { &ty::PredicateKind::Trait(poly_trait_pred, _) => { tcx.collect_referenced_late_bound_regions(&ty::Binder::bind(poly_trait_pred)) } @@ -465,7 +465,7 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> { .iter() .filter(|p| { !orig_bounds.contains(p) - || match p.ignore_qualifiers().skip_binder().kind() { + || match p.ignore_quantifiers().skip_binder().kind() { ty::PredicateKind::Trait(pred, _) => pred.def_id() == sized_trait, _ => false, } diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 23defc51a37..a86ee12fa99 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -480,7 +480,7 @@ impl Clean<WherePredicate> for hir::WherePredicate<'_> { impl<'a> Clean<Option<WherePredicate>> for ty::Predicate<'a> { fn clean(&self, cx: &DocContext<'_>) -> Option<WherePredicate> { - match self.ignore_qualifiers().skip_binder().kind() { + match self.ignore_quantifiers().skip_binder().kind() { &ty::PredicateKind::Trait(pred, _) => Some(ty::Binder::bind(pred).clean(cx)), &ty::PredicateKind::Subtype(pred) => Some(ty::Binder::bind(pred).clean(cx)), &ty::PredicateKind::RegionOutlives(pred) => ty::Binder::bind(pred).clean(cx), @@ -755,7 +755,7 @@ impl<'a, 'tcx> Clean<Generics> for (&'a ty::Generics, ty::GenericPredicates<'tcx .flat_map(|(p, _)| { let mut projection = None; let param_idx = (|| { - match p.ignore_qualifiers().skip_binder().kind() { + match p.ignore_quantifiers().skip_binder().kind() { &ty::PredicateKind::Trait(pred, _constness) => { if let ty::Param(param) = pred.self_ty().kind { return Some(param.index); @@ -1662,9 +1662,9 @@ impl<'tcx> Clean<Type> for Ty<'tcx> { .iter() .filter_map(|predicate| { // Note: The substs of opaque types can contain unbound variables, - // meaning that we have to use `ignore_qualifiers_with_unbound_vars` here. + // meaning that we have to use `ignore_quantifiers_with_unbound_vars` here. let trait_ref = match predicate - .ignore_qualifiers_with_unbound_vars(cx.tcx) + .ignore_quantifiers_with_unbound_vars(cx.tcx) .skip_binder() .kind() { @@ -1692,7 +1692,7 @@ impl<'tcx> Clean<Type> for Ty<'tcx> { .iter() .filter_map(|pred| { if let ty::PredicateKind::Projection(proj) = pred - .ignore_qualifiers_with_unbound_vars(cx.tcx) + .ignore_quantifiers_with_unbound_vars(cx.tcx) .skip_binder() .kind() { diff --git a/src/librustdoc/clean/simplify.rs b/src/librustdoc/clean/simplify.rs index 75c5fb4c9f8..98e461fe695 100644 --- a/src/librustdoc/clean/simplify.rs +++ b/src/librustdoc/clean/simplify.rs @@ -141,7 +141,8 @@ fn trait_is_same_or_supertrait(cx: &DocContext<'_>, child: DefId, trait_: DefId) .predicates .iter() .filter_map(|(pred, _)| { - if let ty::PredicateKind::Trait(pred, _) = pred.ignore_qualifiers().skip_binder().kind() + if let ty::PredicateKind::Trait(pred, _) = + pred.ignore_quantifiers().skip_binder().kind() { if pred.trait_ref.self_ty() == self_ty { Some(pred.def_id()) } else { None } } else { |
