Skip to content

Commit 9dc667d

Browse files
committedJul 8, 2014
Remove rust_colorcolumn, set textwidth to 99
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.
1 parent 94cfd1b commit 9dc667d

File tree

2 files changed

+2
-27
lines changed

2 files changed

+2
-27
lines changed
 

‎src/etc/vim/doc/rust.txt

-6
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ g:rustc_makeprg_no_percent~
3434
let g:rustc_makeprg_no_percent = 1
3535
<
3636

37-
*g:rust_colorcolumn*
38-
g:rust_colorcolumn~
39-
Set this option to use 'colorcolumn' to highlight the text width
40-
indicate the 100 column recommended hard limit on line lengths: >
41-
let g:rust_colorcolumn = 1
42-
<
4337
*g:rust_conceal*
4438
g:rust_conceal~
4539
Set this option to turn on the basic |conceal| support: >

‎src/etc/vim/ftplugin/rust.vim

+2-21
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
" Description: Vim syntax file for Rust
33
" Maintainer: Chris Morgan <me@chrismorgan.info>
44
" Maintainer: Kevin Ballard <kevin@sb.org>
5-
" Last Change: July 06, 2014
5+
" Last Change: Jul 07, 2014
66

77
if exists("b:did_ftplugin")
88
finish
@@ -37,22 +37,7 @@ setlocal smartindent nocindent
3737

3838
setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab
3939

40-
" Line lengths {{{2
41-
42-
" Rust style conventions for line lengths say you SHOULD not go over 80
43-
" columns and MUST not go over 100.
44-
" Without a good 'formatexpr' we can't automatically wrap code, but we can
45-
" still wrap comments just fine with 'textwidth'.
46-
setlocal textwidth=80
47-
48-
" We can also use 'colorcolumn' to highlight both the 80 and 100 limits. Not
49-
" everyone likes this so it's gated.
50-
if exists('g:rust_colorcolumn')
51-
setlocal colorcolumn=+1,101
52-
let b:rust_colorcolumn=1
53-
endif
54-
55-
" }}}2
40+
setlocal textwidth=99
5641

5742
" This includeexpr isn't perfect, but it's a good start
5843
setlocal includeexpr=substitute(v:fname,'::','/','g')
@@ -112,10 +97,6 @@ endif
11297
let b:undo_ftplugin = "
11398
\ setlocal formatoptions< comments< commentstring< includeexpr< suffixesadd<
11499
\|setlocal tabstop< shiftwidth< softtabstop< expandtab< textwidth<
115-
\|if exists('b:rust_colorcolumn')
116-
\|setlocal colorcolumn<
117-
\|unlet b:rust_colorcolumn
118-
\|endif
119100
\|if exists('b:rust_original_delimitMate_excluded_regions')
120101
\|let b:delimitMate_excluded_regions = b:rust_original_delimitMate_excluded_regions
121102
\|unlet b:rust_original_delimitMate_excluded_regions

0 commit comments

Comments
 (0)