Commit d677a2d

committed

Further simplifications

1 parent 560c6cc commit d677a2dCopy full SHA for d677a2d

File tree

-36

lines changed

-36

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ impl<T> ExpectedFound<T> {`
`32`	`32`	`pub enum TypeError<'tcx> {`
`33`	`33`	`Mismatch,`
`34`	`34`	`ConstnessMismatch(ExpectedFound<ty::BoundConstness>),`
`35`		`- PolarityMismatch(ExpectedFound<ty::ImplPolarity>),`
	`35`	`+ PolarityMismatch(ExpectedFound<ty::PredicatePolarity>),`
`36`	`36`	`UnsafetyMismatch(ExpectedFound<hir::Unsafety>),`
`37`	`37`	`AbiMismatch(ExpectedFound<abi::Abi>),`
`38`	`38`	`Mutability,`

Lines changed: 3 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -280,17 +280,6 @@ pub enum ImplPolarity {`
`280`	`280`	`Reservation,`
`281`	`281`	`}`
`282`	`282`
`283`		`-impl ImplPolarity {`
`284`		- /// Flips polarity by turning `Positive` into `Negative` and `Negative` into `Positive`.
`285`		`- pub fn flip(&self) -> Option<ImplPolarity> {`
`286`		`- match self {`
`287`		`- ImplPolarity::Positive => Some(ImplPolarity::Negative),`
`288`		`- ImplPolarity::Negative => Some(ImplPolarity::Positive),`
`289`		`- ImplPolarity::Reservation => None,`
`290`		`- }`
`291`		`- }`
`292`		`-}`
`293`		`-`
`294`	`283`	`impl fmt::Display for ImplPolarity {`
`295`	`284`	`fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {`
`296`	`285`	`match self {`
`@@ -301,15 +290,9 @@ impl fmt::Display for ImplPolarity {`
`301`	`290`	`}`
`302`	`291`	`}`
`303`	`292`
`304`		`-impl From<PredicatePolarity> for ImplPolarity {`
`305`		`- fn from(value: PredicatePolarity) -> Self {`
`306`		`- match value {`
`307`		`- PredicatePolarity::Positive => ImplPolarity::Positive,`
`308`		`- PredicatePolarity::Negative => ImplPolarity::Negative,`
`309`		`- }`
`310`		`- }`
`311`		`-}`
`312`		`-`
	`293`	`+/// Polarity for a trait predicate. May either be negative or positive.`
	`294`	+/// Distinguished from [`ImplPolarity`] since we never compute goals with
	`295`	`+/// "reservation" level.`
`313`	`296`	`#[derive(Copy, Clone, PartialEq, Eq, Hash, TyEncodable, TyDecodable, HashStable, Debug)]`
`314`	`297`	`#[derive(TypeFoldable, TypeVisitable)]`
`315`	`298`	`pub enum PredicatePolarity {`

Lines changed: 1 addition & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -769,27 +769,13 @@ impl<'tcx> Relate<'tcx> for GenericArg<'tcx> {`
`769`	`769`	`}`
`770`	`770`	`}`
`771`	`771`
`772`		`-impl<'tcx> Relate<'tcx> for ty::ImplPolarity {`
`773`		`- fn relate<R: TypeRelation<'tcx>>(`
`774`		`- _relation: &mut R,`
`775`		`- a: ty::ImplPolarity,`
`776`		`- b: ty::ImplPolarity,`
`777`		`- ) -> RelateResult<'tcx, ty::ImplPolarity> {`
`778`		`- if a != b { Err(TypeError::PolarityMismatch(expected_found(a, b))) } else { Ok(a) }`
`779`		`- }`
`780`		`-}`
`781`		`-`
`782`	`772`	`impl<'tcx> Relate<'tcx> for ty::PredicatePolarity {`
`783`	`773`	`fn relate<R: TypeRelation<'tcx>>(`
`784`	`774`	`_relation: &mut R,`
`785`	`775`	`a: ty::PredicatePolarity,`
`786`	`776`	`b: ty::PredicatePolarity,`
`787`	`777`	`) -> RelateResult<'tcx, ty::PredicatePolarity> {`
`788`		`- if a != b {`
`789`		`- Err(TypeError::PolarityMismatch(expected_found(a.into(), b.into())))`
`790`		`- } else {`
`791`		`- Ok(a)`
`792`		`- }`
	`778`	`+ if a != b { Err(TypeError::PolarityMismatch(expected_found(a, b))) } else { Ok(a) }`
`793`	`779`	`}`
`794`	`780`	`}`
`795`	`781`

Comments

(0)