---

yaml
---
r: 160527
b: refs/heads/auto
c: 75e4d95
h: refs/heads/master
i:
  160525: 7aca1c7
  160523: bc2e5f2
  160519: f423470
  160511: 6ac63fa
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: 0207e25d70b1a5733b170ac9f16a9702db8ee8ed
+refs/heads/auto: 75e4d9583832c158a9c0927cdb087e4555434993
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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

@@ -23,9 +23,13 @@ endif
 " support variations like 'cargo.toml'.
 let s:cargo_manifest_name = get(g:, 'cargo_manifest_name', 'Cargo.toml')
 
+function! s:is_absolute(path)
+    return a:path[0] == '/' || a:path =~ '[A-Z]\+:'
+endfunction
+
 let s:local_manifest = findfile(s:cargo_manifest_name, '.;')
 if s:local_manifest != ''
-	let s:local_manifest = fnamemodify(s:local_manifest, ':p:h').'/'
+    let s:local_manifest = fnamemodify(s:local_manifest, ':p:h').'/'
     augroup cargo
         au!
         au QuickfixCmdPost make call s:FixPaths()
@@ -43,14 +47,14 @@ if s:local_manifest != ''
                     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)
-            if filereadable(filename)
+            if s:is_absolute(filename)
                 continue
             endif
             let qf.filename = simplify(manifest.filename)

branches/auto/src/etc/vim/doc/rust.txt

@@ -79,6 +79,13 @@ g:ftplugin_rust_source_path~
 	    let g:ftplugin_rust_source_path = $HOME.'/dev/rust'
 <
 
+                                                       *g:cargo_manifest_name*
+g:cargo_manifest_name~
+	Set this option to the name of the manifest file for your projects. If
+	not specified it defaults to 'Cargo.toml' : >
+	    let g:cargo_manifest_name = 'Cargo.toml'
+<
+
 ==============================================================================
 COMMANDS                                                       *rust-commands*