user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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 |