From d9e139ae2384b04af05ce9343aa0d0a5bae5449b Mon Sep 17 00:00:00 2001 From: Dan Aloni Date: Thu, 28 Jun 2018 00:36:02 +0300 Subject: Rust Cargo linter: Improve workspace support (#1679) * Rust Cargo linter: Improve workspace support When using Cargo workspaces [1], there is a 'Cargo.toml' directory in a top level directory, listing all the crates in the project. If we are currently editing one of the crates, 'cargo build' should execute in that directory for that crate's separate `Cargo.toml`, otherwise Cargo may spend more time possibly rebuilding the entire workspace, and maybe failing on one of the other crates, instead of succeeding on the current. [1] https://doc.rust-lang.org/book/second-edition/ch14-03-cargo-workspaces.html --- .../cargo_workspace_paths/Cargo.toml | 0 .../cargo_workspace_paths/subpath/Cargo.toml | 0 .../test_cargo_command_callbacks.vader | 23 ++++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 test/command_callback/cargo_workspace_paths/Cargo.toml create mode 100644 test/command_callback/cargo_workspace_paths/subpath/Cargo.toml (limited to 'test') diff --git a/test/command_callback/cargo_workspace_paths/Cargo.toml b/test/command_callback/cargo_workspace_paths/Cargo.toml new file mode 100644 index 00000000..e69de29b diff --git a/test/command_callback/cargo_workspace_paths/subpath/Cargo.toml b/test/command_callback/cargo_workspace_paths/subpath/Cargo.toml new file mode 100644 index 00000000..e69de29b diff --git a/test/command_callback/test_cargo_command_callbacks.vader b/test/command_callback/test_cargo_command_callbacks.vader index f674645f..6bdc10b6 100644 --- a/test/command_callback/test_cargo_command_callbacks.vader +++ b/test/command_callback/test_cargo_command_callbacks.vader @@ -5,6 +5,7 @@ Before: Save g:ale_rust_cargo_check_examples Save g:ale_rust_cargo_default_feature_behavior Save g:ale_rust_cargo_include_features + Save g:ale_rust_cargo_avoid_whole_workspace unlet! g:ale_rust_cargo_use_check unlet! g:ale_rust_cargo_check_all_targets @@ -12,6 +13,7 @@ Before: unlet! g:ale_rust_cargo_check_examples unlet! g:ale_rust_cargo_default_feature_behavior unlet! g:ale_rust_cargo_include_features + unlet! g:ale_rust_cargo_avoid_whole_workspace runtime ale_linters/rust/cargo.vim call ale#test#SetDirectory('/testplugin/test/command_callback') @@ -198,3 +200,24 @@ Execute(--all-features should be used when g:ale_rust_cargo_default_feature_beha \ ale_linters#rust#cargo#GetCommand(bufnr(''), [ \ 'cargo 0.22.0 (3423351a5 2017-10-06)', \ ]) + +Execute(When a crate belongs to a workspace we chdir into the crate.): + call ale#test#SetFilename('cargo_workspace_paths/subpath/test.rs') + + if ale#Has('win32') + let test_cdprefix = "C:\\testplugin\\test\\command_callback\\cargo_workspace_paths\\subpath" + else + let test_cdprefix = "'/testplugin/test/command_callback/cargo_workspace_paths/subpath'" + endif + + AssertEqual + \ "cd ".test_cdprefix." && cargo build --frozen --message-format=json -q", + \ ale_linters#rust#cargo#GetCommand(bufnr(''), []) + +Execute(When a crate belongs to a workspace we chdir into the crate, unless we disabled it): + let g:ale_rust_cargo_avoid_whole_workspace = 0 + call ale#test#SetFilename('cargo_workspace_paths/subpath/test.rs') + + AssertEqual + \ "cargo build --frozen --message-format=json -q", + \ ale_linters#rust#cargo#GetCommand(bufnr(''), []) -- cgit v1.2.3