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

check_pat_slice: shadow 'expected' to make sure it's not used again

Browse Source
This commit is contained in:
Mazdak Farrokhzad 2019-12-19 19:18:41 +01:00
parent 3a93a0e860
commit 7d99e4e4c2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/librustc_typeck/check/pat.rs
View File

@ -1175,8 +1175,8 @@ fn check_pat_slice(
discrim_span: Option<Span>,
) -> Ty<'tcx> {
let tcx = self.tcx;
let expected_ty = self.structurally_resolved_type(span, expected);
let (inner_ty, slice_ty) = match expected_ty.kind {
let expected = self.structurally_resolved_type(span, expected);
let (inner_ty, slice_ty) = match expected.kind {
// An array, so we might have something like `let [a, b, c] = [0, 1, 2];`.
ty::Array(inner_ty, size) => {
let slice_ty = if let Some(size) = size.try_eval_usize(tcx, self.param_env) {
@ -1208,11 +1208,11 @@ fn check_pat_slice(
};
(inner_ty, slice_ty)
}
ty::Slice(inner_ty) => (inner_ty, expected_ty),
ty::Slice(inner_ty) => (inner_ty, expected),
// The expected type must be an array or slice, but was neither, so error.
_ => {
if !expected_ty.references_error() {
self.error_expected_array_or_slice(span, expected_ty);
if !expected.references_error() {
self.error_expected_array_or_slice(span, expected);
}
(tcx.types.err, tcx.types.err)
}
@ -1230,7 +1230,7 @@ fn check_pat_slice(
for elt in after {
self.check_pat(&elt, inner_ty, def_bm, discrim_span);
}
expected_ty
expected
}
fn error_scrutinee_inconsistent_length(&self, span: Span, min_len: u64, size: u64) {