bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Enable 2021 compatibility lints for all in-tree code

Browse source 
This just applies the suggested fixes from the compatibility warnings,
leaving any that are in practice spurious in. This is primarily intended to
provide a starting point to identify possible fixes to the migrations (e.g., by
avoiding spurious warnings).

A secondary commit cleans these up where they are false positives (as is true in
many of the cases).
This commit is contained in:
Mark Rousskov 2021-09-18 17:37:24 -04:00
parent 5e1a614b53
commit 45b989a033
12 changed files with 52 additions and 34 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 |_| InferOk { value: (), obligations: fields.obligations })
fields.sub(a_is_expected).relate(a, b).map(move |_| {
let _ = &fields;
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 |_| InferOk { value: (), obligations: fields.obligations })
fields.equate(a_is_expected).relate(a, b).map(move |_| {
let _ = &fields;
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| InferOk { value: t, obligations: fields.obligations })
fields.lub(a_is_expected).relate(a, b).map(move |t| {
let _ = &fields;
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| InferOk { value: t, obligations: fields.obligations })
fields.glb(a_is_expected).relate(a, b).map(move |t| {
let _ = &fields;
InferOk { value: t, obligations: fields.obligations }
})
})
}
}