---

yaml
---
r: 160490
b: refs/heads/master
c: 83f6a29
h: refs/heads/master
v: v3

Author: Damien Radtke

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1e2e2ac5550d4f1d89c4958ef35860ffff9ab6ef
+refs/heads/master: 83f6a29f12c0e8231606d56b6a20df0dd0a78464
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c9f6d696420107f82304b992cf623b806995fe18
 refs/heads/try: 225de0d60f8ca8dcc62ab2fd8818ebbda4b58cfe

trunk/src/etc/vim/compiler/cargo.vim

@@ -3,17 +3,28 @@
 " Maintainer:       Damien Radtke <[email protected]>
 " Latest Revision:  2014 Sep 24
 
-if exists("current_compiler")
+if exists('current_compiler')
   finish
 endif
 let current_compiler = "cargo"
 
-if exists(":CompilerSet") != 2
+if exists(':CompilerSet') != 2
     command -nargs=* CompilerSet setlocal <args>
 endif
 
-CompilerSet errorformat=%A%f:%l:%c:\ %m,%-Z%p^,%-C%.%#
-CompilerSet makeprg=cargo\ $*
+if exists('g:cargo_makeprg_params')
+    execute 'CompilerSet makeprg=cargo\ '.g:cargo_makeprg_params.'\ $*'
+else
+    CompilerSet makeprg=cargo\ $*
+endif
+
+CompilerSet errorformat=
+			\%f:%l:%c:\ %t%*[^:]:\ %m,
+			\%f:%l:%c:\ %*\\d:%*\\d\ %t%*[^:]:\ %m,
+			\%-G%f:%l\ %s,
+			\%-G%*[\ ]^,
+			\%-G%*[\ ]^%*[~],
+			\%-G%*[\ ]...
 
 " Allow a configurable global Cargo.toml name. This makes it easy to
 " support variations like 'cargo.toml'.