From 0143eb6a53fdf77e6d11b5d714501db2667b3ee2 Mon Sep 17 00:00:00 2001
From: notkild <notkild@gmail.com>
Date: Mon, 6 Feb 2017 09:21:06 +0100
Subject: Fix rust linting with cargo when multiple targets are present

---
 ale_linters/rust/cargo.vim | 4 ++--
 ale_linters/rust/rustc.vim | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'ale_linters')

diff --git a/ale_linters/rust/cargo.vim b/ale_linters/rust/cargo.vim
index 738821d7..8c782656 100644
--- a/ale_linters/rust/cargo.vim
+++ b/ale_linters/rust/cargo.vim
@@ -15,7 +15,7 @@ endfunction
 call ale#linter#Define('rust', {
 \   'name': 'cargo',
 \   'executable_callback': 'ale_linters#rust#cargo#GetCargoExecutable',
-\   'command': 'cargo rustc -- --error-format=json -Z no-trans',
+\   'command': 'cargo build --message-format=json -q',
 \   'callback': 'ale_linters#rust#rustc#HandleRustcErrors',
-\   'output_stream': 'stderr',
+\   'output_stream': 'stdout',
 \})
diff --git a/ale_linters/rust/rustc.vim b/ale_linters/rust/rustc.vim
index 3eeede66..e31b895c 100644
--- a/ale_linters/rust/rustc.vim
+++ b/ale_linters/rust/rustc.vim
@@ -17,12 +17,20 @@ function! ale_linters#rust#rustc#HandleRustcErrors(buffer_number, errorlines) ab
         endif
 
         let l:error = json_decode(l:errorline)
+        if !has_key(l:error, 'code') && !has_key(l:error, 'message')
+            continue
+        endif
+
+        if has_key(l:error, 'message')
+            let l:error = l:error.message
+        endif
 
         if !empty(l:error.code) && index(g:ale_rust_ignore_error_codes, l:error.code.code) > -1
             continue
         endif
 
         for l:span in l:error.spans
+            let l:span.file_name = fnamemodify(l:span.file_name, ':t')
             if l:span.is_primary &&
                 \   (l:span.file_name ==# l:file_name || l:span.file_name ==# '<anon>')
                 call add(l:output, {
-- 
cgit v1.2.3