diff options
| author | bors <bors@rust-lang.org> | 2018-07-18 17:13:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-18 17:13:11 +0000 |
| commit | 58cc626de3301192d5d8c6dcbde43b5b44211ae2 (patch) | |
| tree | 59829d59479b725a1eb33767b9d0a6d16b598662 /src/librustc/middle/mem_categorization.rs | |
| parent | 5f2b325f64ed6caa7179f3e04913db437656ec7e (diff) | |
| parent | 9ea66dc4c5570fc87185e0d68bb2846a9a452624 (diff) | |
| download | rust-1.27.2.tar.gz rust-1.27.2.zip | |
Auto merge of #52481 - Mark-Simulacrum:stable-next, r=alexcrichton 1.27.2
1.27.2 stable release This is essentially a backport of https://github.com/rust-lang/rust/pull/52232. I've set the release date for Friday, July 20th. r? @alexcrichton
Diffstat (limited to 'src/librustc/middle/mem_categorization.rs')
| -rw-r--r-- | src/librustc/middle/mem_categorization.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/middle/mem_categorization.rs b/src/librustc/middle/mem_categorization.rs index fa668678ece..0c05740423f 100644 --- a/src/librustc/middle/mem_categorization.rs +++ b/src/librustc/middle/mem_categorization.rs @@ -1325,7 +1325,7 @@ impl<'a, 'gcx, 'tcx> MemCategorizationContext<'a, 'gcx, 'tcx> { ref ty => span_bug!(pat.span, "tuple pattern unexpected type {:?}", ty), }; for (i, subpat) in subpats.iter().enumerate_and_adjust(expected_len, ddpos) { - let subpat_ty = self.pat_ty_unadjusted(&subpat)?; // see (*2) + let subpat_ty = self.pat_ty_adjusted(&subpat)?; // see (*2) let interior = InteriorField(FieldIndex(i, Name::intern(&i.to_string()))); let subcmt = Rc::new(self.cat_imm_interior(pat, cmt.clone(), subpat_ty, interior)); self.cat_pattern_(subcmt, &subpat, op)?; |
