Skip to content

Commit 83f6a29

Browse files
author
Damien Radtke
committed
Use rustc's errorformat and add option to specify permanent parameters.
1 parent 1e2e2ac commit 83f6a29

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

src/etc/vim/compiler/cargo.vim

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,28 @@
33
" Maintainer: Damien Radtke <[email protected]>
44
" Latest Revision: 2014 Sep 24
55

6-
if exists("current_compiler")
6+
if exists('current_compiler')
77
finish
88
endif
99
let current_compiler = "cargo"
1010

11-
if exists(":CompilerSet") != 2
11+
if exists(':CompilerSet') != 2
1212
command -nargs=* CompilerSet setlocal <args>
1313
endif
1414

15-
CompilerSet errorformat=%A%f:%l:%c:\ %m,%-Z%p^,%-C%.%#
16-
CompilerSet makeprg=cargo\ $*
15+
if exists('g:cargo_makeprg_params')
16+
execute 'CompilerSet makeprg=cargo\ '.g:cargo_makeprg_params.'\ $*'
17+
else
18+
CompilerSet makeprg=cargo\ $*
19+
endif
20+
21+
CompilerSet errorformat=
22+
\%f:%l:%c:\ %t%*[^:]:\ %m,
23+
\%f:%l:%c:\ %*\\d:%*\\d\ %t%*[^:]:\ %m,
24+
\%-G%f:%l\ %s,
25+
\%-G%*[\ ]^,
26+
\%-G%*[\ ]^%*[~],
27+
\%-G%*[\ ]...
1728

1829
" Allow a configurable global Cargo.toml name. This makes it easy to
1930
" support variations like 'cargo.toml'.

0 commit comments

Comments
 (0)