about summary refs log tree commit diff
path: root/src/etc/vim/syntax/rust.vim
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-24 04:16:53 +0000
committerbors <bors@rust-lang.org>2014-06-24 04:16:53 +0000
commit768921371311430c8eb953bfdddece53a6071e6e (patch)
tree4fef35c86317ce8b203714e80900632b1ce9eec0 /src/etc/vim/syntax/rust.vim
parent10b12bc123984dfd0858a68c5ad2fe33cdc01ede (diff)
parent33242578331ab6e22384f686d930780d7fdf27e5 (diff)
downloadrust-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/etc/vim/syntax/rust.vim')
-rw-r--r--src/etc/vim/syntax/rust.vim3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim
index 8ef03f87b5b..d8f00ac6b30 100644
--- a/src/etc/vim/syntax/rust.vim
+++ b/src/etc/vim/syntax/rust.vim
@@ -30,8 +30,7 @@ syn keyword   rustKeyword     unsafe virtual while
 syn keyword   rustKeyword     use nextgroup=rustModPath skipwhite skipempty
 " FIXME: Scoped impl's name is also fallen in this category
 syn keyword   rustKeyword     mod trait struct enum type nextgroup=rustIdentifier skipwhite skipempty
-syn keyword   rustStorage     mut ref static
-syn keyword   rustObsoleteStorage const
+syn keyword   rustStorage     mut ref static const
 
 syn keyword   rustInvalidBareKeyword crate