diff --git a/src/librustsyntax/parse/parser.rs b/src/librustsyntax/parse/parser.rs index 4131d3eca96..46ccb09b220 100644 --- a/src/librustsyntax/parse/parser.rs +++ b/src/librustsyntax/parse/parser.rs @@ -1484,7 +1484,7 @@ fn parse_let(p: parser) -> @ast::decl { fn parse_instance_var(p:parser, pr: ast::privacy) -> @ast::class_member { let mut is_mutbl = ast::class_immutable; let lo = p.span.lo; - if eat_word(p, "mut") || eat_word(p, "mutable") { + if eat_word(p, "mut") { is_mutbl = ast::class_mutable; } if !is_plain_ident(p.token) { diff --git a/src/librustsyntax/parse/token.rs b/src/librustsyntax/parse/token.rs index f60e2f26381..9413607aaf1 100644 --- a/src/librustsyntax/parse/token.rs +++ b/src/librustsyntax/parse/token.rs @@ -260,7 +260,7 @@ fn bad_expr_word_table() -> hashmap { "class", "const", "cont", "copy", "crust", "do", "else", "enum", "export", "fail", "fn", "for", "if", "iface", "impl", "import", "let", "log", "loop", "mod", - "mut", "mutable", "native", "new", "pure", "resource", + "mut", "native", "new", "pure", "resource", "ret", "trait", "type", "unchecked", "unsafe", "while"]; for keys.each {|word| words.insert(word, ()); diff --git a/src/test/auxiliary/cci_class_4.rs b/src/test/auxiliary/cci_class_4.rs index 1ed65b21d03..ef16b540d0c 100644 --- a/src/test/auxiliary/cci_class_4.rs +++ b/src/test/auxiliary/cci_class_4.rs @@ -12,7 +12,7 @@ class cat { } } - let mutable how_hungry : int; + let mut how_hungry : int; let name : str; new(in_x : uint, in_y : int, in_name: str) diff --git a/src/test/compile-fail/ctor-uninit-var.rs b/src/test/compile-fail/ctor-uninit-var.rs index 5450cd77189..b6f94c11fe5 100644 --- a/src/test/compile-fail/ctor-uninit-var.rs +++ b/src/test/compile-fail/ctor-uninit-var.rs @@ -1,7 +1,7 @@ // error-pattern:unsatisfied precondition class cat { priv { - let mutable meows : uint; + let mut meows : uint; } let how_hungry : int; diff --git a/src/test/compile-fail/mutable-class-fields-2.rs b/src/test/compile-fail/mutable-class-fields-2.rs index 1c06727ec2e..d00d5dda230 100644 --- a/src/test/compile-fail/mutable-class-fields-2.rs +++ b/src/test/compile-fail/mutable-class-fields-2.rs @@ -1,7 +1,7 @@ // error-pattern:assigning to immutable field class cat { priv { - let mutable meows : uint; + let mut meows : uint; } let how_hungry : int; diff --git a/src/test/compile-fail/mutable-class-fields.rs b/src/test/compile-fail/mutable-class-fields.rs index adac61c5e64..6ee8c5ead7e 100644 --- a/src/test/compile-fail/mutable-class-fields.rs +++ b/src/test/compile-fail/mutable-class-fields.rs @@ -1,7 +1,7 @@ // error-pattern:assigning to immutable field class cat { priv { - let mutable meows : uint; + let mut meows : uint; } let how_hungry : int; diff --git a/src/test/run-pass/class-implement-iface-cross-crate.rs b/src/test/run-pass/class-implement-iface-cross-crate.rs index 2c845fa1c03..7a0cfef5398 100644 --- a/src/test/run-pass/class-implement-iface-cross-crate.rs +++ b/src/test/run-pass/class-implement-iface-cross-crate.rs @@ -15,7 +15,7 @@ class cat implements noisy { } } - let mutable how_hungry : int; + let mut how_hungry : int; let name : str; new(in_x : uint, in_y : int, in_name: str) diff --git a/src/test/run-pass/class-implement-ifaces.rs b/src/test/run-pass/class-implement-ifaces.rs index 6e09d045820..01fde15d02d 100644 --- a/src/test/run-pass/class-implement-ifaces.rs +++ b/src/test/run-pass/class-implement-ifaces.rs @@ -14,7 +14,7 @@ class cat implements noisy { } } - let mutable how_hungry : int; + let mut how_hungry : int; let name : str; new(in_x : uint, in_y : int, in_name: str) diff --git a/src/test/run-pass/classes.rs b/src/test/run-pass/classes.rs index f2790cee354..59a8efcaad7 100644 --- a/src/test/run-pass/classes.rs +++ b/src/test/run-pass/classes.rs @@ -10,7 +10,7 @@ class cat { } } - let mutable how_hungry : int; + let mut how_hungry : int; let name : str; new(in_x : uint, in_y : int, in_name: str)