Skip to content

Commit

Permalink
Merge pull request #20689 from huonw/editor-_size
Browse files Browse the repository at this point in the history
Update editor syntax files for isize/usize.

Reviewed-by: nikomatsakis
  • Loading branch information
bors committed Jan 7, 2015
2 parents f7105bf + 6c7291e commit 2a8cb67
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/etc/emacs/rust-mode.el
Expand Up @@ -189,7 +189,7 @@
"u64" "i64"

"f32" "f64"
"float" "int" "uint"
"float" "int" "uint" "isize" "usize"
"bool"
"str" "char"))

Expand Down
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/etc/kate/rust.xml
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/etc/vim/syntax/rust.vim
Expand Up @@ -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
Expand Down

0 comments on commit 2a8cb67

Please sign in to comment.