bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Define values and err as non mutable

Browse source
This commit is contained in:
Santiago Pastorino 2022-11-30 12:59:22 -03:00
parent 4dacf4f469
commit 89047430f1
No known key found for this signature in database
GPG key ID: 8131A24E0C79EFAF
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
View file

@ -1576,18 +1576,15 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
return; return;
} }
let mut values = None;
self.probe(|_| { self.probe(|_| {
let ocx = ObligationCtxt::new_in_snapshot(self); let ocx = ObligationCtxt::new_in_snapshot(self);
let mut err = error.err;
// try to find the mismatched types to report the error with. // try to find the mismatched types to report the error with.
// //
// this can fail if the problem was higher-ranked, in which // this can fail if the problem was higher-ranked, in which
// cause I have no idea for a good error message. // cause I have no idea for a good error message.
let bound_predicate = predicate.kind(); let bound_predicate = predicate.kind();
if let ty::PredicateKind::Clause(ty::Clause::Projection(data)) = let (values, err) = if let ty::PredicateKind::Clause(ty::Clause::Projection(data)) =
bound_predicate.skip_binder() bound_predicate.skip_binder()
{ {
let data = self.replace_bound_vars_with_fresh_vars( let data = self.replace_bound_vars_with_fresh_vars(
@ -1628,10 +1625,13 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
normalized_ty, normalized_ty,
expected_ty, expected_ty,
) { ) {
values = Some((data, is_normalized_ty_expected, normalized_ty, expected_ty)); (Some((data, is_normalized_ty_expected, normalized_ty, expected_ty)), new_err)
err = new_err; } else {
} (None, error.err)
} }
} else {
(None, error.err)
};
let msg = values let msg = values
.and_then(|(predicate, _, normalized_ty, expected_ty)| { .and_then(|(predicate, _, normalized_ty, expected_ty)| {