Commit bc3a3a5

authored

Rollup merge of #145009 - jackh726:ra-next-solver-changes, r=compiler-errors

A couple small changes for rust-analyzer next-solver work Originally written by ``@flodiebold``

2 parents 8d11a6f + a8f6528 commit bc3a3a5Copy full SHA for bc3a3a5

File tree

+30

-12

lines changed

+30

-12

lines changed

Lines changed: 1 addition & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@ use rustc_macros::{HashStable, extension};`
`6`	`6`	`use rustc_type_ir as ir;`
`7`	`7`
`8`	`8`	`use crate::ty::{`
`9`		`- self, DebruijnIndex, EarlyBinder, PredicatePolarity, Ty, TyCtxt, TypeFlags, Upcast, UpcastFrom,`
`10`		`- WithCachedTypeInfo,`
	`9`	`+ self, DebruijnIndex, EarlyBinder, Ty, TyCtxt, TypeFlags, Upcast, UpcastFrom, WithCachedTypeInfo,`
`11`	`10`	`};`
`12`	`11`
`13`	`12`	`pub type TraitRef<'tcx> = ir::TraitRef<TyCtxt<'tcx>>;`
`@@ -536,15 +535,6 @@ impl<'tcx> UpcastFrom<TyCtxt<'tcx>, ty::Binder<'tcx, TraitRef<'tcx>>> for Clause`
`536`	`535`	`}`
`537`	`536`	`}`
`538`	`537`
`539`		`-impl<'tcx> UpcastFrom<TyCtxt<'tcx>, ty::Binder<'tcx, TraitRef<'tcx>>> for PolyTraitPredicate<'tcx> {`
`540`		`- fn upcast_from(from: ty::Binder<'tcx, TraitRef<'tcx>>, _tcx: TyCtxt<'tcx>) -> Self {`
`541`		`- from.map_bound(\|trait_ref\| TraitPredicate {`
`542`		`- trait_ref,`
`543`		`- polarity: PredicatePolarity::Positive,`
`544`		`- })`
`545`		`- }`
`546`		`-}`
`547`		`-`
`548`	`538`	`impl<'tcx> UpcastFrom<TyCtxt<'tcx>, TraitPredicate<'tcx>> for Predicate<'tcx> {`
`549`	`539`	`fn upcast_from(from: TraitPredicate<'tcx>, tcx: TyCtxt<'tcx>) -> Self {`
`550`	`540`	`PredicateKind::Clause(ClauseKind::Trait(from)).upcast(tcx)`

Lines changed: 20 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,10 @@ use rustc_data_structures::stable_hasher::{HashStable, StableHasher};`
`7`	`7`	`use rustc_macros::{Decodable_NoContext, Encodable_NoContext, HashStable_NoContext};`
`8`	`8`	`use rustc_type_ir_macros::{Lift_Generic, TypeFoldable_Generic, TypeVisitable_Generic};`
`9`	`9`
`10`		`-use crate::{self as ty, DebruijnIndex, Interner};`
	`10`	`+use crate::{`
	`11`	`+ self as ty, DebruijnIndex, FallibleTypeFolder, Interner, TypeFoldable, TypeFolder,`
	`12`	`+ TypeVisitable, TypeVisitor, VisitorResult,`
	`13`	`+};`
`11`	`14`
`12`	`15`	`/// Represents a constant in Rust.`
`13`	`16`	`#[derive_where(Clone, Copy, Hash, PartialEq, Eq; I: Interner)]`
`@@ -120,3 +123,19 @@ impl<CTX> HashStable<CTX> for InferConst {`
`120`	`123`	`}`
`121`	`124`	`}`
`122`	`125`	`}`
	`126`	`+`
	`127`	`+impl<I: Interner> TypeFoldable<I> for InferConst {`
	`128`	`+ fn try_fold_with<F: FallibleTypeFolder<I>>(self, _folder: &mut F) -> Result<Self, F::Error> {`
	`129`	`+ Ok(self)`
	`130`	`+ }`
	`131`	`+`
	`132`	`+ fn fold_with<F: TypeFolder<I>>(self, _folder: &mut F) -> Self {`
	`133`	`+ self`
	`134`	`+ }`
	`135`	`+}`
	`136`	`+`
	`137`	`+impl<I: Interner> TypeVisitable<I> for InferConst {`
	`138`	`+ fn visit_with<V: TypeVisitor<I>>(&self, _visitor: &mut V) -> V::Result {`
	`139`	`+ V::Result::output()`
	`140`	`+ }`
	`141`	`+}`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,15 @@ impl<I: Interner> UpcastFrom<I, TraitRef<I>> for TraitPredicate<I> {`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`
	`187`	`+impl<I: Interner> UpcastFrom<I, ty::Binder<I, TraitRef<I>>> for ty::Binder<I, TraitPredicate<I>> {`
	`188`	`+ fn upcast_from(from: ty::Binder<I, TraitRef<I>>, _tcx: I) -> Self {`
	`189`	`+ from.map_bound(\|trait_ref\| TraitPredicate {`
	`190`	`+ trait_ref,`
	`191`	`+ polarity: PredicatePolarity::Positive,`
	`192`	`+ })`
	`193`	`+ }`
	`194`	`+}`
	`195`	`+`
`187`	`196`	`impl<I: Interner> fmt::Debug for TraitPredicate<I> {`
`188`	`197`	`fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {`
`189`	`198`	`write!(f, "TraitPredicate({:?}, polarity:{:?})", self.trait_ref, self.polarity)`

Comments

(0)