squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Remove rust_colorcolumn, set textwidth to 99

Browse source 
The latest change to aturon/rust-guidelines states that lines must not
exceed 99 characters. This gets rid of the 80/100 split, so we don't
need to customize colorcolumn amymore.
This commit is contained in:
Kevin Ballard 2014-07-07 22:19:59 -07:00
parent 94cfd1b4ad
commit 9dc667d472
2 changed files with 2 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/etc/vim/doc/rust.txt
View file

@ -34,12 +34,6 @@ 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: >

23
src/etc/vim/ftplugin/rust.vim
View file

@ -2,7 +2,7 @@
" Description: Vim syntax file for Rust
" Maintainer: Chris Morgan <me@chrismorgan.info>
" Maintainer: Kevin Ballard <kevin@sb.org>
" Last Change: July 06, 2014
" Last Change: Jul 07, 2014
if exists("b:did_ftplugin")
finish
@ -37,22 +37,7 @@ setlocal smartindent nocindent
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
setlocal textwidth=99
" This includeexpr isn't perfect, but it's a good start
setlocal includeexpr=substitute(v:fname,'::','/','g')
@ -112,10 +97,6 @@ endif
let b:undo_ftplugin = "
\ 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