diff options
| author | bors <bors@rust-lang.org> | 2020-05-21 22:14:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-21 22:14:26 +0000 |
| commit | d9417b385145af1cabd0be8a95c65075d2fc30ff (patch) | |
| tree | 9a6348569c253000ec5edea9c6f15677687d26a7 /src/librustdoc/clean/auto_trait.rs | |
| parent | 9310e3bd4f425f84fc27878ebf2bda1f30935a63 (diff) | |
| parent | 74b5c50214c0edd9582d75fa472ed9a7ea25c0e5 (diff) | |
| download | rust-d9417b385145af1cabd0be8a95c65075d2fc30ff.tar.gz rust-d9417b385145af1cabd0be8a95c65075d2fc30ff.zip | |
Auto merge of #72433 - RalfJung:rollup-srft8nx, r=RalfJung
Rollup of 7 pull requests Successful merges: - #72055 (Intern predicates) - #72149 (Don't `type_of` on trait assoc ty without default) - #72347 (Make intra-link resolve links for both trait and impl items) - #72350 (Improve documentation of `slice::from_raw_parts`) - #72382 (Show default values for debug-assertions & debug-assertions-std) - #72421 (Fix anchor display when hovering impl) - #72425 (fix discriminant_value sign extension) Failed merges: r? @ghost
Diffstat (limited to 'src/librustdoc/clean/auto_trait.rs')
| -rw-r--r-- | src/librustdoc/clean/auto_trait.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/librustdoc/clean/auto_trait.rs b/src/librustdoc/clean/auto_trait.rs index 144c1699a3c..423160f3a9e 100644 --- a/src/librustdoc/clean/auto_trait.rs +++ b/src/librustdoc/clean/auto_trait.rs @@ -315,11 +315,11 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> { tcx: TyCtxt<'tcx>, pred: ty::Predicate<'tcx>, ) -> FxHashSet<GenericParamDef> { - let regions = match pred { - ty::Predicate::Trait(poly_trait_pred, _) => { + let regions = match pred.kind() { + ty::PredicateKind::Trait(poly_trait_pred, _) => { tcx.collect_referenced_late_bound_regions(&poly_trait_pred) } - ty::Predicate::Projection(poly_proj_pred) => { + ty::PredicateKind::Projection(poly_proj_pred) => { tcx.collect_referenced_late_bound_regions(&poly_proj_pred) } _ => return FxHashSet::default(), @@ -465,8 +465,8 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> { .iter() .filter(|p| { !orig_bounds.contains(p) - || match p { - ty::Predicate::Trait(pred, _) => pred.def_id() == sized_trait, + || match p.kind() { + ty::PredicateKind::Trait(pred, _) => pred.def_id() == sized_trait, _ => false, } }) |
