bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

MIR typeck: rustfmt

Browse source
This commit is contained in:
Niko Matsakis 2017-11-07 04:40:35 -05:00
parent 034018cd90
commit 37945fe3e8
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/librustc_mir/transform/type_check.rs
View file

@ -391,10 +391,9 @@ impl<'a, 'gcx, 'tcx> TypeChecker<'a, 'gcx, 'tcx> {
traits::ObligationCause::misc(span, self.body_id) traits::ObligationCause::misc(span, self.body_id)
} }
fn fully_perform_op<OP, R>(&self, fn fully_perform_op<OP, R>(&self, op: OP) -> Result<R, TypeError<'tcx>>
op: OP) where
-> Result<R, TypeError<'tcx>> OP: FnOnce() -> InferResult<'tcx, R>,
where OP: FnOnce() -> InferResult<'tcx, R>
{ {
let mut fulfill_cx = FulfillmentContext::new(); let mut fulfill_cx = FulfillmentContext::new();
let InferOk { value, obligations } = self.infcx.commit_if_ok(|_| op())?; let InferOk { value, obligations } = self.infcx.commit_if_ok(|_| op())?;
@ -405,12 +404,7 @@ impl<'a, 'gcx, 'tcx> TypeChecker<'a, 'gcx, 'tcx> {
Ok(value) Ok(value)
} }
fn sub_types( fn sub_types(&self, sub: Ty<'tcx>, sup: Ty<'tcx>, _at_location: Location) -> UnitResult<'tcx> {
&self,
sub: Ty<'tcx>,
sup: Ty<'tcx>,
_at_location: Location,
) -> UnitResult<'tcx> {
self.fully_perform_op(|| { self.fully_perform_op(|| {
self.infcx self.infcx
.at(&self.misc(self.last_span), self.param_env) .at(&self.misc(self.last_span), self.param_env)