diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 8c4bf5d87ab00..0d5e3dc38b21b 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2814,18 +2814,33 @@ impl Parser { } let lo1 = self.last_span.lo; + let bind_type = if self.eat_keyword(keywords::Mut) { + BindByValue(MutMutable) + } else if self.eat_keyword(keywords::Ref) { + BindByRef(self.parse_mutability()) + } else { + BindByValue(MutImmutable) + }; + let fieldname = self.parse_ident(); let hi1 = self.last_span.lo; let fieldpath = ast_util::ident_to_path(mk_sp(lo1, hi1), fieldname); let subpat; if *self.token == token::COLON { + match bind_type { + BindByRef(..) | BindByValue(MutMutable) => + self.fatal(format!("unexpected `{}`", + self.this_token_to_str())), + _ => {} + } + self.bump(); subpat = self.parse_pat(); } else { subpat = @ast::Pat { id: ast::DUMMY_NODE_ID, - node: PatIdent(BindByValue(MutImmutable), fieldpath, None), + node: PatIdent(bind_type, fieldpath, None), span: *self.last_span }; } diff --git a/src/test/compile-fail/bind-struct-early-modifiers.rs b/src/test/compile-fail/bind-struct-early-modifiers.rs new file mode 100644 index 0000000000000..b9ae0d341d9a2 --- /dev/null +++ b/src/test/compile-fail/bind-struct-early-modifiers.rs @@ -0,0 +1,17 @@ +// Copyright 2013 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +fn main() { + struct Foo { x: int } + match Foo { x: 10 } { + Foo { ref x: ref x } => {}, //~ ERROR unexpected `:` + _ => {} + } +} diff --git a/src/test/run-pass/bind-field-short-with-modifiers.rs b/src/test/run-pass/bind-field-short-with-modifiers.rs new file mode 100644 index 0000000000000..470577d729730 --- /dev/null +++ b/src/test/run-pass/bind-field-short-with-modifiers.rs @@ -0,0 +1,31 @@ +// Copyright 2013 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +pub fn main() { + struct Foo { x: int, y: int } + let mut f = Foo { x: 10, y: 0 }; + match f { + Foo { ref mut x, .. } => *x = 11, + } + match f { + Foo { ref x, ref y } => { + assert_eq!(f.x, 11); + assert_eq!(f.y, 0); + } + } + match f { + Foo { mut x, y: ref mut y } => { + x = 12; + *y = 1; + } + } + assert_eq!(f.x, 11); + assert_eq!(f.y, 1); +}