Skip to content

Commit 453dc54

Browse files
authored
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).
2 parents 7f4e7c1 + 1179866 commit 453dc54

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

src/bootstrap/tool.rs

-10
Original file line numberDiff line numberDiff line change
@@ -747,19 +747,9 @@ impl Step for RustAnalyzerProcMacroSrv {
747747
const ONLY_HOSTS: bool = true;
748748

749749
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
750-
let builder = run.builder;
751-
752750
// Allow building `rust-analyzer-proc-macro-srv` both as part of the `rust-analyzer` and as a stand-alone tool.
753751
run.path("src/tools/rust-analyzer")
754752
.path("src/tools/rust-analyzer/crates/proc-macro-srv-cli")
755-
.default_condition(
756-
builder.config.extended
757-
&& builder.config.tools.as_ref().map_or(true, |tools| {
758-
tools.iter().any(|tool| {
759-
tool == "rust-analyzer" || tool == "rust-analyzer-proc-macro-srv"
760-
})
761-
}),
762-
)
763753
}
764754

765755
fn make_run(run: RunConfig<'_>) {

0 commit comments

Comments
 (0)