---

yaml
---
r: 124637
b: refs/heads/try
c: 94cfd1b
h: refs/heads/master
i:
  124635: 472fa9b
v: v3

Author: lilyball

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: f15d6d28396e8700b6c3f2704204a2769e710403
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
-refs/heads/try: c6492040b260b09e92526e10807dfa7e71f8c901
+refs/heads/try: 94cfd1b4adb16b059e1b596c7f3f96af4fc7726b
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/etc/vim/doc/rust.txt

@@ -1,7 +1,7 @@
 *rust.txt*      Filetype plugin for Rust
 
 ==============================================================================
-CONTENTS                                                                *rust*
+CONTENTS                                                      *rust* *ft-rust*
 
 1. Introduction                                                   |rust-intro|
 2. Settings                                                    |rust-settings|
@@ -34,6 +34,12 @@ g:rustc_makeprg_no_percent~
 	    let g:rustc_makeprg_no_percent = 1
 <
 
+                                                          *g:rust_colorcolumn*
+g:rust_colorcolumn~
+	Set this option to use 'colorcolumn' to highlight the text width
+	indicate the 100 column recommended hard limit on line lengths: >
+	    let g:rust_colorcolumn = 1
+<
                                                               *g:rust_conceal*
 g:rust_conceal~
 	Set this option to turn on the basic |conceal| support: >

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

@@ -2,7 +2,7 @@
 " Description:  Vim syntax file for Rust
 " Maintainer:   Chris Morgan <[email protected]>
 " Maintainer:   Kevin Ballard <[email protected]>
-" Last Change:  May 27, 2014
+" Last Change:  July 06, 2014
 
 if exists("b:did_ftplugin")
 	finish
@@ -35,7 +35,24 @@ silent! setlocal formatoptions+=j
 " otherwise it's better than nothing.
 setlocal smartindent nocindent
 
-setlocal tabstop=4 shiftwidth=4 expandtab
+setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab
+
+" Line lengths {{{2
+
+" Rust style conventions for line lengths say you SHOULD not go over 80
+" columns and MUST not go over 100.
+" Without a good 'formatexpr' we can't automatically wrap code, but we can
+" still wrap comments just fine with 'textwidth'.
+setlocal textwidth=80
+
+" We can also use 'colorcolumn' to highlight both the 80 and 100 limits. Not
+" everyone likes this so it's gated.
+if exists('g:rust_colorcolumn')
+	setlocal colorcolumn=+1,101
+	let b:rust_colorcolumn=1
+endif
+
+" }}}2
 
 " This includeexpr isn't perfect, but it's a good start
 setlocal includeexpr=substitute(v:fname,'::','/','g')
@@ -93,7 +110,12 @@ endif
 " Cleanup {{{1
 
 let b:undo_ftplugin = "
-		\setlocal formatoptions< comments< commentstring< includeexpr< suffixesadd<
+		\ setlocal formatoptions< comments< commentstring< includeexpr< suffixesadd<
+		\|setlocal tabstop< shiftwidth< softtabstop< expandtab< textwidth<
+		\|if exists('b:rust_colorcolumn')
+		  \|setlocal colorcolumn<
+		  \|unlet b:rust_colorcolumn
+		\|endif
 		\|if exists('b:rust_original_delimitMate_excluded_regions')
 		  \|let b:delimitMate_excluded_regions = b:rust_original_delimitMate_excluded_regions
 		  \|unlet b:rust_original_delimitMate_excluded_regions