---

yaml
---
r: 160526
b: refs/heads/auto
c: 0207e25
h: refs/heads/master
v: v3

Author: Damien Radtke

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 83f6a29f12c0e8231606d56b6a20df0dd0a78464
+refs/heads/auto: 0207e25d70b1a5733b170ac9f16a9702db8ee8ed
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/etc/vim/compiler/cargo.vim

@@ -6,35 +6,26 @@
 if exists('current_compiler')
   finish
 endif
+runtime compiler/rustc.vim
 let current_compiler = "cargo"
 
 if exists(':CompilerSet') != 2
     command -nargs=* CompilerSet setlocal <args>
 endif
 
 if exists('g:cargo_makeprg_params')
-    execute 'CompilerSet makeprg=cargo\ '.g:cargo_makeprg_params.'\ $*'
+    execute 'CompilerSet makeprg=cargo\ '.escape(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'.
-if !exists('g:cargo_manifest_name')
-    let g:cargo_manifest_name = 'Cargo.toml'
-endif
-
-let s:local_manifest = fnamemodify(findfile(g:cargo_manifest_name, '.;'), ':p:h').'/'
+let s:cargo_manifest_name = get(g:, 'cargo_manifest_name', 'Cargo.toml')
 
+let s:local_manifest = findfile(s:cargo_manifest_name, '.;')
 if s:local_manifest != ''
+	let s:local_manifest = fnamemodify(s:local_manifest, ':p:h').'/'
     augroup cargo
         au!
         au QuickfixCmdPost make call s:FixPaths()
@@ -46,23 +37,23 @@ if s:local_manifest != ''
         let qflist = getqflist()
         let manifest = s:local_manifest
         for qf in qflist
-            if !qf['valid']
-                let m = matchlist(qf['text'], '\v.*\(file://(.*)\)$')
-                if len(m) > 0
+            if !qf.valid
+                let m = matchlist(qf.text, '(file://\(.*\))$')
+                if !empty(m)
                     let manifest = m[1].'/'
                     " Manually strip another slash if needed; usually just an
                     " issue on Windows.
-                    if manifest =~ '^/[A-Z]*:/'
+                    if manifest =~ '^/[A-Z]:/'
                         let manifest = manifest[1:]
                     endif
                 endif
                 continue
             endif
-            let filename = bufname(qf['bufnr'])
+            let filename = bufname(qf.bufnr)
             if filereadable(filename)
                 continue
             endif
-            let qf['filename'] = simplify(manifest.filename)
+            let qf.filename = simplify(manifest.filename)
             call remove(qf, 'bufnr')
         endfor
         call setqflist(qflist, 'r')