Skip to content

Commit 8fa0973

Browse files
committed
auto merge of #7658 : excepttheweasel/rust/mut_default_param_list_issue_7483, r=pcwalton
2 parents 8a7b636 + 56d1987 commit 8fa0973

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

src/libsyntax/parse/parser.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1074,10 +1074,9 @@ impl Parser {
10741074
// This version of parse arg doesn't necessarily require
10751075
// identifier names.
10761076
pub fn parse_arg_general(&self, require_name: bool) -> arg {
1077-
let mut is_mutbl = false;
1077+
let mut is_mutbl = self.eat_keyword(keywords::Mut);
10781078
let pat = if require_name || self.is_named_argument() {
10791079
self.parse_arg_mode();
1080-
is_mutbl = self.eat_keyword(keywords::Mut);
10811080
let pat = self.parse_pat();
10821081

10831082
if is_mutbl && !ast_util::pat_is_ident(pat) {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#[allow(default_methods)];
12+
13+
trait Foo {
14+
fn foo(&self, mut v: int) { v = 1; }
15+
}
16+
17+
fn main() {}

0 commit comments

Comments
 (0)