diff options
| -rw-r--r-- | src/librustc_trans/trans/_match.rs | 3 | ||||
| -rw-r--r-- | src/test/run-pass/issue-26996.rs | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/src/librustc_trans/trans/_match.rs b/src/librustc_trans/trans/_match.rs index 3aa98ab031d..9a9b9c617a8 100644 --- a/src/librustc_trans/trans/_match.rs +++ b/src/librustc_trans/trans/_match.rs @@ -1384,7 +1384,8 @@ impl<'tcx> euv::Delegate<'tcx> for ReassignmentChecker { match base_cmt.cat { mc::cat_upvar(mc::Upvar { id: ty::UpvarId { var_id: vid, .. }, .. }) | mc::cat_local(vid) => { - self.reassigned |= self.node == vid && Some(field) == self.field + self.reassigned |= self.node == vid && + (self.field.is_none() || Some(field) == self.field) }, _ => {} } diff --git a/src/test/run-pass/issue-26996.rs b/src/test/run-pass/issue-26996.rs new file mode 100644 index 00000000000..e17845a68bc --- /dev/null +++ b/src/test/run-pass/issue-26996.rs @@ -0,0 +1,19 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +fn main() { + let mut c = (1, "".to_owned()); + match c { + c2 => { + c.0 = 2; + assert_eq!(c2.0, 1); + } + } +} |