diff options
| author | bors <bors@rust-lang.org> | 2021-12-12 22:15:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-12 22:15:32 +0000 |
| commit | 22f8bde876f2fa9c5c4e95be1bce29cc271f2b51 (patch) | |
| tree | 780b4d0cada258ab3536c7bacbaf99dbf7980359 /src/librustdoc | |
| parent | 6bda5b331cfe7e04e1fe348c58a928fc2b650f4f (diff) | |
| parent | ffc9082d97cf88ac4d8f72bca0382b2499a0184d (diff) | |
| download | rust-22f8bde876f2fa9c5c4e95be1bce29cc271f2b51.tar.gz rust-22f8bde876f2fa9c5c4e95be1bce29cc271f2b51.zip | |
Auto merge of #91549 - fee1-dead:const_env, r=spastorino
Eliminate ConstnessAnd again Closes #91489. Closes #89432. Reverts #91491. Reverts #89450. r? `@spastorino`
Diffstat (limited to 'src/librustdoc')
| -rw-r--r-- | src/librustdoc/clean/blanket_impl.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/librustdoc/clean/blanket_impl.rs b/src/librustdoc/clean/blanket_impl.rs index 80e3bb5c662..dca02cb25bd 100644 --- a/src/librustdoc/clean/blanket_impl.rs +++ b/src/librustdoc/clean/blanket_impl.rs @@ -3,7 +3,7 @@ use rustc_hir as hir; use rustc_infer::infer::{InferOk, TyCtxtInferExt}; use rustc_infer::traits; use rustc_middle::ty::subst::Subst; -use rustc_middle::ty::{ToPredicate, WithConstness}; +use rustc_middle::ty::ToPredicate; use rustc_span::DUMMY_SP; use super::*; @@ -66,7 +66,8 @@ impl<'a, 'tcx> BlanketImplFinder<'a, 'tcx> { .into_iter() .chain(Some( ty::Binder::dummy(trait_ref) - .without_const() + .to_poly_trait_predicate() + .map_bound(ty::PredicateKind::Trait) .to_predicate(infcx.tcx), )); for predicate in predicates { |