summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcos <cos>2022-02-18 17:18:43 +0100
committercos <cos>2022-02-19 16:53:08 +0100
commit573ffd3b1e74dd0a6bd568ea3d163e7b38390655 (patch)
tree82f4523e5e7a9db9347d510010b8555a3241a679
parentf861206d0b2e441bbd7aca53de311f79eeae24db (diff)
downloadale-573ffd3b1e74dd0a6bd568ea3d163e7b38390655.zip
fixup, wip: Revert `rust_only_current_buffer`
There is already a `rust_ignore_secondary_spans` option, providing more hiding of errors than anyone likely can desire.
-rw-r--r--ale_linters/rust/cargo.vim1
-rw-r--r--autoload/ale/handlers/rust.vim20
-rw-r--r--doc/ale-rust.txt11
3 files changed, 1 insertions, 31 deletions
diff --git a/ale_linters/rust/cargo.vim b/ale_linters/rust/cargo.vim
index e5fe888d..37fd10a8 100644
--- a/ale_linters/rust/cargo.vim
+++ b/ale_linters/rust/cargo.vim
@@ -12,7 +12,6 @@ call ale#Set('rust_cargo_include_features', '')
call ale#Set('rust_cargo_use_clippy', 0)
call ale#Set('rust_cargo_clippy_options', '')
call ale#Set('rust_cargo_target_dir', '')
-call ale#Set('rust_only_current_buffer', '0')
function! ale_linters#rust#cargo#GetCargoExecutable(bufnr) abort
if ale#path#FindNearestFile(a:bufnr, 'Cargo.toml') isnot# ''
diff --git a/autoload/ale/handlers/rust.vim b/autoload/ale/handlers/rust.vim
index 60656577..8ad7b031 100644
--- a/autoload/ale/handlers/rust.vim
+++ b/autoload/ale/handlers/rust.vim
@@ -11,20 +11,6 @@ if !exists('g:ale_rust_ignore_secondary_spans')
let g:ale_rust_ignore_secondary_spans = 0
endif
-function! s:FindSpan(buffer, span) abort
- if ale#path#IsBufferPath(a:buffer, a:span.file_name) || a:span.file_name is# '<anon>'
- return a:span
- endif
-
- " Search inside the expansion of an error, as the problem for this buffer
- " could lie inside a nested object.
- if !empty(get(a:span, 'expansion', v:null))
- return s:FindSpan(a:buffer, a:span.expansion.span)
- endif
-
- return {}
-endfunction
-
function! ale#handlers#rust#HandleRustErrors(buffer, lines) abort
let l:output = []
@@ -52,11 +38,7 @@ function! ale#handlers#rust#HandleRustErrors(buffer, lines) abort
endif
for l:root_span in l:error.spans
- if ale#Var(a:buffer, 'rust_only_current_buffer')
- let l:span = s:FindSpan(a:buffer, l:root_span)
- else
- let l:span = l:root_span
- endif
+ let l:span = l:root_span
if ale#Var(a:buffer, 'rust_ignore_secondary_spans') && !get(l:span, 'is_primary', 1)
continue
diff --git a/doc/ale-rust.txt b/doc/ale-rust.txt
index c51273ab..9307ca33 100644
--- a/doc/ale-rust.txt
+++ b/doc/ale-rust.txt
@@ -41,17 +41,6 @@ Integration Information
Also note that rustc 1.18. or later is needed.
===============================================================================
-TODO
-
-g:ale_rust_only_current_buffer *g:ale_rust_only_current_buffer*
- *b:ale_rust_only_current_buffer*
- Type: |Number|
- Default: `0`
-
- Option to restore buggy operation. (FIXME: The existance of this option
- might or might not be desired.)
-
-===============================================================================
analyzer *ale-rust-analyzer*
g:ale_rust_analyzer_executable *g:ale_rust_analyzer_executable*