diff options
| author | bors <bors@rust-lang.org> | 2013-09-21 22:20:56 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-21 22:20:56 -0700 |
| commit | eabcb39f8d5c634185174461481ec1f39fe07bcb (patch) | |
| tree | 8302f2642ab6db697fb21f63dc70d931e51ab04d | |
| parent | d72e3328aca3a4331e650ab800409b2b6551b339 (diff) | |
| parent | 72633a2af25e0155ca9952a635f7a52d0c88bf00 (diff) | |
| download | rust-eabcb39f8d5c634185174461481ec1f39fe07bcb.tar.gz rust-eabcb39f8d5c634185174461481ec1f39fe07bcb.zip | |
auto merge of #9401 : bytbox/rust/master, r=thestinger
Along with a tiny bit of cleanup in rust.vim.
| -rw-r--r-- | src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang | 1 | ||||
| -rw-r--r-- | src/etc/kate/rust.xml | 1 | ||||
| -rw-r--r-- | src/etc/vim/syntax/rust.vim | 3 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang b/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang index b1180098bd2..1d55d4a02e5 100644 --- a/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang +++ b/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang @@ -39,7 +39,6 @@ <keyword>assert</keyword> <keyword>break</keyword> <keyword>const</keyword> - <keyword>copy</keyword> <keyword>do</keyword> <keyword>drop</keyword> <keyword>else</keyword> diff --git a/src/etc/kate/rust.xml b/src/etc/kate/rust.xml index 6aa95307147..8f02ee6a1dd 100644 --- a/src/etc/kate/rust.xml +++ b/src/etc/kate/rust.xml @@ -18,7 +18,6 @@ <list name="keywords"> <item> as </item> <item> break </item> - <item> copy </item> <item> do </item> <item> drop </item> <item> else </item> diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index 0a95f31b067..e5d2d542c0f 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -18,9 +18,8 @@ syn keyword rustOperator as syn match rustAssert "\<assert\(\w\)*!" contained syn match rustFail "\<fail\(\w\)*!" contained -syn keyword rustKeyword break copy do extern +syn keyword rustKeyword break do extern syn keyword rustKeyword in if impl let log -syn keyword rustKeyword copy do extern syn keyword rustKeyword for impl let log syn keyword rustKeyword loop mod once priv pub syn keyword rustKeyword return |