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/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");