diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2015-01-17 17:00:32 +0100 |
|---|---|---|
| committer | Andrea Canciani <ranma42@dhcp-131-114-88-208.di.unipi.it> | 2015-02-04 01:25:24 +0100 |
| commit | 8f7c2d518d1892c98d2ef57992a65669834f24e2 (patch) | |
| tree | d5e22f83ee530be53fab6c6ca2a7d37f2b9d0a62 /src | |
| parent | 3b2ed14906fd9f9daa27cc7d1dad263d2f5ff450 (diff) | |
| download | rust-8f7c2d518d1892c98d2ef57992a65669834f24e2.tar.gz rust-8f7c2d518d1892c98d2ef57992a65669834f24e2.zip | |
Replace `be` with `become`
As per rust-lang/rfcs#601, replace `be` with `become` as reserved keyword for tail call optimization.
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc/grammar.md | 2 | ||||
| -rw-r--r-- | src/doc/reference.md | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/token.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/reserved-become.rs (renamed from src/test/compile-fail/reserved-be.rs) | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/doc/grammar.md b/src/doc/grammar.md index 59a1c8f828b..b4e023c2039 100644 --- a/src/doc/grammar.md +++ b/src/doc/grammar.md @@ -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 | diff --git a/src/doc/reference.md b/src/doc/reference.md index 64ddb3ffdd3..c83cbbce2b2 100644 --- a/src/doc/reference.md +++ b/src/doc/reference.md @@ -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 | diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 5c3892e49c0..b7357e13a56 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -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"); diff --git a/src/test/compile-fail/reserved-be.rs b/src/test/compile-fail/reserved-become.rs index 386d53cc16e..82e9ebc10d1 100644 --- a/src/test/compile-fail/reserved-be.rs +++ b/src/test/compile-fail/reserved-become.rs @@ -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 } |