---

yaml
---
r: 30354
b: refs/heads/incoming
c: 2ba632a
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 3a34c96086e88466e350100af874f07b387a7620
+refs/heads/incoming: 2ba632a683f21f306e1f71c1bd867752b93ebd3b
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/etc/vim/after/syntax/rust.vim

@@ -25,6 +25,13 @@ syn match rustNiceOperator "=>" contains=rustFatRightArrowHead,rustFatRightArrow
 
 syn match rustNiceOperator /\<\@!_\(_*\>\)\@=/ conceal cchar=′
 
+" For those who don't want to see `pub`...
+if exists('g:rust_conceal_pub')
+    syn match rustPublicSigil contained "pu" conceal cchar=＊
+    syn match rustPublicRest contained "b" conceal cchar= 
+    syn match rustNiceOperator "pub " contains=rustPublicSigil,rustPublicRest
+endif
+
 hi link rustNiceOperator Operator
 
 if !exists('g:rust_conceal_mod_path')

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

@@ -14,7 +14,8 @@ 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     loop match mod module move mut new of owned priv pure
+syn match     rustKeyword     "\<pub\>"
 syn keyword   rustKeyword     ref return static to unchecked
 syn match     rustKeyword     "\<unsafe\>" " Allows also matching unsafe::foo()
 syn keyword   rustKeyword     use while with