diff options
| author | bors <bors@rust-lang.org> | 2015-01-07 15:35:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-07 15:35:34 +0000 |
| commit | 2a8cb678e61e91c160d80794b5fdd723d0d4211c (patch) | |
| tree | c9fd4a40792e75e28bb9850916ee1f37e5fc1132 | |
| parent | f7105bfade7f230c6a18a79679cef4d7f1ef4867 (diff) | |
| parent | 6c7291ece47d0b263a3d3dadbda2ff7d034f705f (diff) | |
| download | rust-2a8cb678e61e91c160d80794b5fdd723d0d4211c.tar.gz rust-2a8cb678e61e91c160d80794b5fdd723d0d4211c.zip | |
Merge pull request #20689 from huonw/editor-_size
Update editor syntax files for isize/usize. Reviewed-by: nikomatsakis
| -rw-r--r-- | src/etc/emacs/rust-mode.el | 2 | ||||
| -rw-r--r-- | src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang | 2 | ||||
| -rw-r--r-- | src/etc/kate/rust.xml | 2 | ||||
| -rw-r--r-- | src/etc/vim/syntax/rust.vim | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/src/etc/emacs/rust-mode.el b/src/etc/emacs/rust-mode.el index 6917e9ee354..661dc21e2dc 100644 --- a/src/etc/emacs/rust-mode.el +++ b/src/etc/emacs/rust-mode.el @@ -189,7 +189,7 @@ "u64" "i64" "f32" "f64" - "float" "int" "uint" + "float" "int" "uint" "isize" "usize" "bool" "str" "char")) 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 373e9f78cc2..8291b38a9bd 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 @@ -79,7 +79,9 @@ <context id="types" style-ref="type"> <keyword>bool</keyword> <keyword>int</keyword> + <keyword>isize</keyword> <keyword>uint</keyword> + <keyword>usize</keyword> <keyword>i8</keyword> <keyword>i16</keyword> <keyword>i32</keyword> diff --git a/src/etc/kate/rust.xml b/src/etc/kate/rust.xml index 41dc2d1fbda..925034eaa00 100644 --- a/src/etc/kate/rust.xml +++ b/src/etc/kate/rust.xml @@ -91,7 +91,9 @@ <list name="types"> <item> bool </item> <item> int </item> + <item> isize </item> <item> uint </item> + <item> usize </item> <item> i8 </item> <item> i16 </item> <item> i32 </item> diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index dce6d3f6687..678cb3e1602 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -59,7 +59,7 @@ syn match rustMacroVariable "$\w\+" syn keyword rustReservedKeyword alignof be do offsetof priv pure sizeof typeof unsized yield abstract final override macro " Built-in types {{{2 -syn keyword rustType int uint float char bool u8 u16 u32 u64 f32 +syn keyword rustType int isize uint usize float char bool u8 u16 u32 u64 f32 syn keyword rustType f64 i8 i16 i32 i64 str Self " Things from the prelude (src/libstd/prelude.rs) {{{2 |