about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-12-11 00:30:18 +0100
committerGitHub <noreply@github.com>2022-12-11 00:30:18 +0100
commit453dc54ba94761625a18d910f89bc4f8908bf8b0 (patch)
treeee4f11eb4ce7ad196c511c430fc79b693a14c7cd
parent7f4e7c159bdae213471e4c53c191616258c8beb7 (diff)
parent11798660accab57ad9ea5e487ddc39a2acfba8ad (diff)
downloadrust-453dc54ba94761625a18d910f89bc4f8908bf8b0.tar.gz
rust-453dc54ba94761625a18d910f89bc4f8908bf8b0.zip
Rollup merge of #105459 - jyn514:proc-macro-default, r=Mark-Simulacrum
Build rust-analyzer proc-macro server by default

This allows getting rid of some documentation and an extra step when building a custom toolchain: https://rustc-dev-guide.rust-lang.org/building/how-to-build-and-run.html#creating-a-rustup-toolchain and it seems likely that people will want to do this if they want rustdoc (which is also built by default).
-rw-r--r--src/bootstrap/tool.rs10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index e0be4c432f1..24b033cc0dc 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -747,19 +747,9 @@ impl Step for RustAnalyzerProcMacroSrv {
     const ONLY_HOSTS: bool = true;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        let builder = run.builder;
-
         // Allow building `rust-analyzer-proc-macro-srv` both as part of the `rust-analyzer` and as a stand-alone tool.
         run.path("src/tools/rust-analyzer")
             .path("src/tools/rust-analyzer/crates/proc-macro-srv-cli")
-            .default_condition(
-                builder.config.extended
-                    && builder.config.tools.as_ref().map_or(true, |tools| {
-                        tools.iter().any(|tool| {
-                            tool == "rust-analyzer" || tool == "rust-analyzer-proc-macro-srv"
-                        })
-                    }),
-            )
     }
 
     fn make_run(run: RunConfig<'_>) {