diff options
| author | bors <bors@rust-lang.org> | 2014-06-24 04:16:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-24 04:16:53 +0000 |
| commit | 768921371311430c8eb953bfdddece53a6071e6e (patch) | |
| tree | 4fef35c86317ce8b203714e80900632b1ce9eec0 /src/libsyntax/parse/token.rs | |
| parent | 10b12bc123984dfd0858a68c5ad2fe33cdc01ede (diff) | |
| parent | 33242578331ab6e22384f686d930780d7fdf27e5 (diff) | |
| download | rust-768921371311430c8eb953bfdddece53a6071e6e.tar.gz rust-768921371311430c8eb953bfdddece53a6071e6e.zip | |
auto merge of #14952 : alexcrichton/rust/const-unsafe-pointers, r=brson
This does not yet change the compiler and libraries from `*T` to `*const T` as it will require a snapshot to do so. cc #7362 --- Note that the corresponding RFC, https://github.com/rust-lang/rfcs/pull/68, has not yet been accepted. It was [discussed at the last meeting](https://github.com/rust-lang/rust/wiki/Meeting-weekly-2014-06-10#rfc-pr-68-unsafe-pointers-rename-t-to-const-t) and decided to be accepted, however. I figured I'd get started on the preliminary work for the RFC that will be required regardless.
Diffstat (limited to 'src/libsyntax/parse/token.rs')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index a2af417ed79..8e36339b0e5 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -512,11 +512,11 @@ declare_special_idents_and_keywords! { (40, Continue, "continue"); (41, Proc, "proc"); (42, Box, "box"); + (43, Const, "const"); 'reserved: - (43, Alignof, "alignof"); - (44, Be, "be"); - (45, Const, "const"); + (44, Alignof, "alignof"); + (45, Be, "be"); (46, Offsetof, "offsetof"); (47, Priv, "priv"); (48, Pure, "pure"); |