bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove Drop-caused migration-added captures

Browse source 
All of these were added due to insignificant Drop types being present.
This commit is contained in:
Mark Rousskov 2021-09-19 13:46:05 -04:00
parent 5e344da217
commit f338900826
9 changed files with 18 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

32
compiler/rustc_infer/src/infer/at.rs
View file

@ -195,10 +195,10 @@ impl<'a, 'tcx> Trace<'a, 'tcx> {
let Trace { at, trace, a_is_expected } = self;
at.infcx.commit_if_ok(|_| {
let mut fields = at.infcx.combine_fields(trace, at.param_env);
fields.sub(a_is_expected).relate(a, b).map(move |_| {
let _ = &fields;
InferOk { value: (), obligations: fields.obligations }
})
fields
.sub(a_is_expected)
.relate(a, b)
.map(move |_| InferOk { value: (), obligations: fields.obligations })
})
}
@ -212,10 +212,10 @@ impl<'a, 'tcx> Trace<'a, 'tcx> {
let Trace { at, trace, a_is_expected } = self;
at.infcx.commit_if_ok(|_| {
let mut fields = at.infcx.combine_fields(trace, at.param_env);
fields.equate(a_is_expected).relate(a, b).map(move |_| {
let _ = &fields;
InferOk { value: (), obligations: fields.obligations }
})
fields
.equate(a_is_expected)
.relate(a, b)
.map(move |_| InferOk { value: (), obligations: fields.obligations })
})
}
@ -227,10 +227,10 @@ impl<'a, 'tcx> Trace<'a, 'tcx> {
let Trace { at, trace, a_is_expected } = self;
at.infcx.commit_if_ok(|_| {
let mut fields = at.infcx.combine_fields(trace, at.param_env);
fields.lub(a_is_expected).relate(a, b).map(move |t| {
let _ = &fields;
InferOk { value: t, obligations: fields.obligations }
})
fields
.lub(a_is_expected)
.relate(a, b)
.map(move |t| InferOk { value: t, obligations: fields.obligations })
})
}
@ -242,10 +242,10 @@ impl<'a, 'tcx> Trace<'a, 'tcx> {
let Trace { at, trace, a_is_expected } = self;
at.infcx.commit_if_ok(|_| {
let mut fields = at.infcx.combine_fields(trace, at.param_env);
fields.glb(a_is_expected).relate(a, b).map(move |t| {
let _ = &fields;
InferOk { value: t, obligations: fields.obligations }
})
fields
.glb(a_is_expected)
.relate(a, b)
.map(move |t| InferOk { value: t, obligations: fields.obligations })
})
}
}