diff options
| author | Joshua Nelson <jnelson@cloudflare.com> | 2022-07-23 15:37:46 -0500 |
|---|---|---|
| committer | Amos Wenger <amoswenger@gmail.com> | 2022-07-24 10:38:42 +0200 |
| commit | ee09dc5510a775963183d4bde9c36dce2a6863ce (patch) | |
| tree | 3bb7e2d575a7a189b5741899d1625a905503c8f9 /src/bootstrap | |
| parent | e0add21c2bdd89a507771fc344927ef85a816c50 (diff) | |
| download | rust-ee09dc5510a775963183d4bde9c36dce2a6863ce.tar.gz rust-ee09dc5510a775963183d4bde9c36dce2a6863ce.zip | |
Small fixups
- use `path` instead of `paths` - don't mark rust-analyzer as an optional tool - print the cargo command that's run in the proc-macro-test build script this originally was part of a change to fix `test --stage 0 rust-analyzer`, but I'm going to leave that for a separate PR so it's easier to review.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/check.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/tool.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs index cfeb1c9d607..394bd8b4e28 100644 --- a/src/bootstrap/check.rs +++ b/src/bootstrap/check.rs @@ -312,7 +312,7 @@ impl Step for RustAnalyzer { const DEFAULT: bool = true; fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { - run.paths(&["src/tools/rust-analyzer"]) + run.path("src/tools/rust-analyzer") } fn make_run(run: RunConfig<'_>) { diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index 3d06ce02216..7c37621d417 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -721,7 +721,7 @@ impl Step for RustAnalyzer { mode: Mode::ToolStd, path: "src/tools/rust-analyzer", extra_features: vec!["rust-analyzer/in-rust-tree".to_owned()], - is_optional_tool: true, + is_optional_tool: false, source_type: SourceType::InTree, }) } |