diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2017-09-22 14:41:22 +1200 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-09-27 15:40:57 -0700 |
| commit | bfcb2909372d4bd1dbd718dbcf3a5eec96a10c62 (patch) | |
| tree | 8037180ca0e6b3eb5f88b133dc17892b54e51ed9 /src | |
| parent | c0ea270f701bd857cc0bd20db1707810fb4b7493 (diff) | |
| download | rust-bfcb2909372d4bd1dbd718dbcf3a5eec96a10c62.tar.gz rust-bfcb2909372d4bd1dbd718dbcf3a5eec96a10c62.zip | |
Add RLS and Rustfmt to the toolstate mechanism
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/check.rs | 12 | ||||
| -rw-r--r-- | src/bootstrap/tool.rs | 4 | ||||
| -rw-r--r-- | src/bootstrap/toolstate.rs | 2 | ||||
| -rw-r--r-- | src/tools/toolstate.toml | 7 |
4 files changed, 21 insertions, 4 deletions
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs index 21e7a052362..6e276f44668 100644 --- a/src/bootstrap/check.rs +++ b/src/bootstrap/check.rs @@ -254,7 +254,11 @@ impl Step for Rls { builder.add_rustc_lib_path(compiler, &mut cargo); - try_run(build, &mut cargo); + try_run_expecting( + build, + &mut cargo, + builder.build.config.toolstate.rls.passes(ToolState::Testing), + ); } } @@ -295,7 +299,11 @@ impl Step for Rustfmt { builder.add_rustc_lib_path(compiler, &mut cargo); - try_run(build, &mut cargo); + try_run_expecting( + build, + &mut cargo, + builder.build.config.toolstate.rustfmt.passes(ToolState::Testing), + ); } } diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index e07ffea2a2e..19879ab2ade 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -454,7 +454,7 @@ impl Step for Rls { tool: "rls", mode: Mode::Librustc, path: "src/tools/rls", - expectation: BuildExpectation::None, + expectation: builder.build.config.toolstate.rls.passes(ToolState::Compiling), }) } } @@ -489,7 +489,7 @@ impl Step for Rustfmt { tool: "rustfmt", mode: Mode::Librustc, path: "src/tools/rustfmt", - expectation: BuildExpectation::None, + expectation: builder.build.config.toolstate.rustfmt.passes(ToolState::Compiling), }) } } diff --git a/src/bootstrap/toolstate.rs b/src/bootstrap/toolstate.rs index 0711c034602..8a113f6b4d2 100644 --- a/src/bootstrap/toolstate.rs +++ b/src/bootstrap/toolstate.rs @@ -46,4 +46,6 @@ impl Default for ToolState { pub struct ToolStates { pub miri: ToolState, pub clippy: ToolState, + pub rls: ToolState, + pub rustfmt: ToolState, } diff --git a/src/tools/toolstate.toml b/src/tools/toolstate.toml index 3cc815ef34e..1700daa0aff 100644 --- a/src/tools/toolstate.toml +++ b/src/tools/toolstate.toml @@ -27,3 +27,10 @@ miri = "Broken" # ping @Manishearth @llogiq @mcarton @oli-obk clippy = "Broken" + +# ping @nrc +rls = "Testing" + +# ping @nrc +rustfmt = "Testing" + |