mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #97080 - lcnr:relate-sus, r=oli-obk

Browse Source 
remove the `RelateResultCompare` trait

it's unused
This commit is contained in:
Yuki Okushi 2022-05-17 19:01:33 +09:00 committed by GitHub
commit 13ee094260
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/rustc_infer/src/infer/combine.rs
View File

@ -776,21 +776,6 @@ pub trait ConstEquateRelation<'tcx>: TypeRelation<'tcx> {
fn const_equate_obligation(&mut self, a: ty::Const<'tcx>, b: ty::Const<'tcx>); fn const_equate_obligation(&mut self, a: ty::Const<'tcx>, b: ty::Const<'tcx>);
} }
pub trait RelateResultCompare<'tcx, T> {
fn compare<F>(&self, t: T, f: F) -> RelateResult<'tcx, T>
where
F: FnOnce() -> TypeError<'tcx>;
}
impl<'tcx, T: Clone + PartialEq> RelateResultCompare<'tcx, T> for RelateResult<'tcx, T> {
fn compare<F>(&self, t: T, f: F) -> RelateResult<'tcx, T>
where
F: FnOnce() -> TypeError<'tcx>,
{
self.clone().and_then(|s| if s == t { self.clone() } else { Err(f()) })
}
}
pub fn const_unification_error<'tcx>( pub fn const_unification_error<'tcx>(
a_is_expected: bool, a_is_expected: bool,
(a, b): (ty::Const<'tcx>, ty::Const<'tcx>), (a, b): (ty::Const<'tcx>, ty::Const<'tcx>),

2
compiler/rustc_infer/src/infer/nll_relate/mod.rs
View File

@ -859,7 +859,7 @@ struct TypeGeneralizer<'me, 'tcx, D>
delegate: &'me mut D, delegate: &'me mut D,
/// After we generalize this type, we are going to relative it to /// After we generalize this type, we are going to relate it to
/// some other type. What will be the variance at this point? /// some other type. What will be the variance at this point?
ambient_variance: ty::Variance, ambient_variance: ty::Variance,