diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2012-07-31 16:32:37 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2012-07-31 16:35:11 -0700 |
| commit | 2cfe8fb357f8ad7e99dc03b09e0ec5fa1c2c9029 (patch) | |
| tree | 56af8b2f6feb43d3393caf47bcebaa8399712257 /src/etc/vim | |
| parent | 567f881fdf4053d4890929eb4cd46c67c4a011ee (diff) | |
| download | rust-2cfe8fb357f8ad7e99dc03b09e0ec5fa1c2c9029.tar.gz rust-2cfe8fb357f8ad7e99dc03b09e0ec5fa1c2c9029.zip | |
rustc: Check self types in method lookup; allow required trait methods to have self types; write self types into metadata
Diffstat (limited to 'src/etc/vim')
| -rw-r--r-- | src/etc/vim/syntax/rust.vim | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index 49e022b93f6..b9fae069708 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -23,7 +23,7 @@ syn keyword rustKeyword use while with syn keyword rustKeyword mod trait class struct enum type nextgroup=rustIdentifier skipwhite syn keyword rustKeyword fn nextgroup=rustFuncName skipwhite -syn match rustIdentifier "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained +syn match rustIdentifier contains=rustIdentifierPrime "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained syn match rustFuncName "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained " Reserved words @@ -114,8 +114,11 @@ syn match rustFatArrowHead contained ">" conceal cchar= syn match rustFatArrowTail contained "=" conceal cchar=⟹ syn match rustFatArrowFull "=>" contains=rustFatArrowHead,rustFatArrowTail -hi def link rustHexNumber rustNumber -hi def link rustBinNumber rustNumber +syn match rustIdentifierPrime /\<\@!_\(_*\>\)\@=/ conceal cchar=′ + +hi def link rustHexNumber rustNumber +hi def link rustBinNumber rustNumber +hi def link rustIdentifierPrime rustIdentifier hi def link rustString String hi def link rustCharacter Character |