bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #21918: ranma42/replace-be

Browse source 
Conflicts:
	src/test/compile-fail/reserved-be.rs
	src/test/compile-fail/reserved-become.rs
	src/test/parse-fail/reserved-be.rs
This commit is contained in:
Alex Crichton 2015-02-10 08:41:30 -08:00
commit 6cf75ca05a
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/doc/grammar.md
View file

@ -157,7 +157,7 @@ token : simple_token | ident | literal | symbol | whitespace token ;
| | | | | |
|----------|----------|----------|----------|--------|
| abstract | alignof | as | be | box |
| abstract | alignof | as | become | box |
| break | const | continue | crate | do |
| else | enum | extern | false | final |
| fn | for | if | impl | in |

2
src/doc/reference.md
View file

@ -189,7 +189,7 @@ grammar as double-quoted strings. Other tokens have exact rules given.
| | | | | |
|----------|----------|----------|----------|---------|
| abstract | alignof | as | be | box |
| abstract | alignof | as | become | box |
| break | const | continue | crate | do |
| else | enum | extern | false | final |
| fn | for | if | impl | in |

2
src/libsyntax/parse/token.rs
View file

@ -562,7 +562,7 @@ declare_special_idents_and_keywords! {
(45, Where, "where");
'reserved:
(46, Alignof, "alignof");
(47, Be, "be");
(47, Become, "become");
(48, Offsetof, "offsetof");
(49, Priv, "priv");
(50, Pure, "pure");

6
src/test/parse-fail/reserved-be.rs → src/test/compile-fail/reserved-become.rs
View file

@ -1,4 +1,4 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
@ -9,6 +9,6 @@
// except according to those terms.
fn main() {
let be = 0;
//~^ ERROR `be` is a reserved keyword
let become = 0;
//~^ ERROR `become` is a reserved keyword
}