diff options
| author | bors <bors@rust-lang.org> | 2014-01-26 22:21:36 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-26 22:21:36 -0800 |
| commit | 4b2fdfaaec1f405ac613a50d448e2dd3f22e3f10 (patch) | |
| tree | 15ac8612739bbfebbe543246d493486a68e06002 | |
| parent | 0119e46204d1bc8937b8c3fb10e3f41a7ebb7733 (diff) | |
| parent | c60db9b30c15aa226d9ed582f49cd0016b238571 (diff) | |
| download | rust-4b2fdfaaec1f405ac613a50d448e2dd3f22e3f10.tar.gz rust-4b2fdfaaec1f405ac613a50d448e2dd3f22e3f10.zip | |
auto merge of #11822 : bytbox/rust/master, r=huonw
Changes only to src/etc.
| -rw-r--r-- | src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang | 3 | ||||
| -rw-r--r-- | src/etc/kate/rust.xml | 3 | ||||
| -rw-r--r-- | src/etc/vim/syntax/rust.vim | 3 |
3 files changed, 0 insertions, 9 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 43700c02b75..88640129708 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 @@ -87,7 +87,6 @@ <keyword>f64</keyword> <keyword>char</keyword> <keyword>str</keyword> - <keyword>Either</keyword> <keyword>Option</keyword> <keyword>Result</keyword> </context> @@ -134,8 +133,6 @@ <keyword>false</keyword> <keyword>Some</keyword> <keyword>None</keyword> - <keyword>Left</keyword> - <keyword>Right</keyword> <keyword>Ok</keyword> <keyword>Err</keyword> <keyword>Success</keyword> diff --git a/src/etc/kate/rust.xml b/src/etc/kate/rust.xml index c1c5215ac0f..c52473f5f07 100644 --- a/src/etc/kate/rust.xml +++ b/src/etc/kate/rust.xml @@ -86,7 +86,6 @@ <item> float </item> <item> char </item> <item> str </item> - <item> Either </item> <item> Option </item> <item> Result </item> <item> Self </item> @@ -131,8 +130,6 @@ <item> false </item> <item> Some </item> <item> None </item> - <item> Left </item> - <item> Right </item> <item> Ok </item> <item> Err </item> <item> Success </item> diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index 3b300b4cc28..dbdb2949b93 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -46,8 +46,6 @@ syn keyword rustType f64 i8 i16 i32 i64 str Self " to make it easy to update. " Core operators {{{3 -syn keyword rustEnum Either -syn keyword rustEnumVariant Left Right syn keyword rustTrait Sized syn keyword rustTrait Freeze Send syn keyword rustTrait Add Sub Mul Div Rem Neg Not @@ -113,7 +111,6 @@ syn keyword rustSelf self syn keyword rustBoolean true false syn keyword rustConstant Some None " option -syn keyword rustConstant Left Right " either syn keyword rustConstant Ok Err " result syn keyword rustConstant Less Equal Greater " Ordering |