---

yaml
---
r: 28015
b: refs/heads/try
c: f7f909a
h: refs/heads/master
i:
  28013: f8f124c
  28011: 0d9c26b
  28007: b530c5e
  27999: 6304063
v: v3

Author: bblum

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 5ccf8175a8ae5f6aaff30bb2330a5f05ec89028d
+refs/heads/try: f7f909a8cffad997b96debbcf4fea47cec64ba19
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/etc/vim/indent/rust.vim

@@ -5,6 +5,4 @@ if exists("b:did_indent")
 endif
 
 let b:did_indent = 1
-setlocal cindent
-setlocal cinkeys-=0#
-setlocal cino=j1,J1
+setlocal smartindent

branches/try/src/etc/vim/syntax/rust.vim

@@ -10,14 +10,13 @@ elseif exists("b:current_syntax")
   finish
 endif
 
-syn keyword   rustAssert      assert
-syn match     rustAssert      "assert\(\w\)*"
-syn keyword   rustKeyword     alt again as break
-syn keyword   rustKeyword     check claim const copy do drop else export extern fail
+syn match     rustAssert      "\<assert\(\w\)*"
+syn keyword   rustKeyword     again as break
+syn keyword   rustKeyword     const copy do drop else export extern fail
 syn keyword   rustKeyword     for if impl import in let log
 syn keyword   rustKeyword     loop match mod module move mut new of owned priv pub pure
-syn keyword   rustKeyword     ref ret return static to unchecked
-syn match     rustKeyword     "unsafe" " Allows also matching unsafe::foo()
+syn keyword   rustKeyword     ref return static to unchecked
+syn match     rustKeyword     "\<unsafe\>" " Allows also matching unsafe::foo()
 syn keyword   rustKeyword     use while with
 " FIXME: Scoped impl's name is also fallen in this category
 syn keyword   rustKeyword     mod trait class struct enum type nextgroup=rustIdentifier skipwhite
@@ -73,7 +72,9 @@ syn match     rustFuncCall    "\w\(\w\)*::<"he=e-3,me=e-3 contains=rustAssert "
 syn match     rustMacro       '\w\(\w\)*!'
 syn match     rustMacro       '#\w\(\w\)*'
 
-syn region    rustString      start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=rustTodo
+syn match     rustFormat      display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlLjzt]\|ll\|hh\)\=\([aAbdiuoxXDOUfFeEgGcCsSpn?]\|\[\^\=.[^]]*\]\)" contained
+syn match     rustFormat      display "%%" contained
+syn region    rustString      start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=rustTodo,rustFormat
 
 syn region    rustAttribute   start="#\[" end="\]" contains=rustString
 
@@ -108,6 +109,7 @@ hi def link rustHexNumber       rustNumber
 hi def link rustBinNumber       rustNumber
 hi def link rustIdentifierPrime rustIdentifier
 
+hi def link rustFormat        Special
 hi def link rustString        String
 hi def link rustCharacter     Character
 hi def link rustNumber        Number