Skip to content

Commit 3ae03e0

Browse files
borsbors
committed
Auto merge of #99603 - fasterthanlime:ra-subtree-2, r=jyn514
Convert rust-analyzer to an in-tree tool This re-adds `rust-lang/rust-analyzer` as a git subtree rather than a submodule. Closes rust-lang/rust-analyzer#12815. Prior attempt (research PR): #99465 * [x] Remove submodule: `git rm -f src/tools/rust-analyzer` * [x] Add subtree: `git subtree add -P src/tools/rust-analyzer https://github.com/rust-lang/rust-analyzer.git master` * [x] Move to `SourceType::InTree`, * [x] Enable `rust-analyzer/in-rust-tree` feature when built through `x.py` * [x] Add 'check' step * [x] Add 'test' step With this PR, rust-analyzer becomes an "in-tree" tool. Syncs can happen in both directions, see [clippy's relevant book section](https://doc.rust-lang.org/nightly/clippy/development/infrastructure/sync.html). Making sure `proc-macro-srv` doesn't break when the proc_macro bridge changes effectively becomes the responsibility of `rust-lang/rust` contributors. These days, that's mostly `@mystor,` who has been consulted throughout the process. I'm also making myself available in case there's questions / work needed that nobody else signed up for. This doesn't change rust-analyzer's release cycle. After this PR is merged and the next nightly goes out, one can point `rust-analyzer.procMacro.server` to the rustup-provided `rust-analyzer` binary. Changes to improve the situation further (auto-discovery/install of the rust-analyzer component) will happen in `rust-lang/rust-analyzer` and be synced here eventually.
2 parents 7fe022f + fa0037a commit 3ae03e0

File tree

1,705 files changed

+346064
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,705 files changed

+346064
-8
lines changed

‎.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
[submodule "src/doc/embedded-book"]
3939
path = src/doc/embedded-book
4040
url = https://github.com/rust-embedded/book.git
41-
[submodule "src/tools/rust-analyzer"]
42-
path = src/tools/rust-analyzer
43-
url = https://github.com/rust-analyzer/rust-analyzer.git
4441
[submodule "library/backtrace"]
4542
path = library/backtrace
4643
url = https://github.com/rust-lang/backtrace-rs.git

‎src/bootstrap/builder.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,7 @@ impl<'a> Builder<'a> {
621621
check::Clippy,
622622
check::Miri,
623623
check::Rls,
624+
check::RustAnalyzer,
624625
check::Rustfmt,
625626
check::Bootstrap
626627
),
@@ -648,6 +649,7 @@ impl<'a> Builder<'a> {
648649
test::Cargotest,
649650
test::Cargo,
650651
test::Rls,
652+
test::RustAnalyzer,
651653
test::ErrorIndex,
652654
test::Distcheck,
653655
test::RunMakeFullDeps,
@@ -1551,7 +1553,7 @@ impl<'a> Builder<'a> {
15511553
Mode::ToolStd => {
15521554
// Right now this is just compiletest and a few other tools that build on stable.
15531555
// Allow them to use `feature(test)`, but nothing else.
1554-
rustflags.arg("-Zallow-features=binary-dep-depinfo,test,backtrace");
1556+
rustflags.arg("-Zallow-features=binary-dep-depinfo,test,backtrace,proc_macro_internals,proc_macro_diagnostic,proc_macro_span");
15551557
}
15561558
Mode::Std | Mode::Rustc | Mode::Codegen | Mode::ToolRustc => {}
15571559
}

‎src/bootstrap/check.rs

+62
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,68 @@ impl Step for CodegenBackend {
301301
}
302302
}
303303

304+
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
305+
pub struct RustAnalyzer {
306+
pub target: TargetSelection,
307+
}
308+
309+
impl Step for RustAnalyzer {
310+
type Output = ();
311+
const ONLY_HOSTS: bool = true;
312+
const DEFAULT: bool = true;
313+
314+
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
315+
run.path("src/tools/rust-analyzer")
316+
}
317+
318+
fn make_run(run: RunConfig<'_>) {
319+
run.builder.ensure(RustAnalyzer { target: run.target });
320+
}
321+
322+
fn run(self, builder: &Builder<'_>) {
323+
let compiler = builder.compiler(builder.top_stage, builder.config.build);
324+
let target = self.target;
325+
326+
builder.ensure(Std { target });
327+
328+
let mut cargo = prepare_tool_cargo(
329+
builder,
330+
compiler,
331+
Mode::ToolStd,
332+
target,
333+
cargo_subcommand(builder.kind),
334+
"src/tools/rust-analyzer",
335+
SourceType::InTree,
336+
&["rust-analyzer/in-rust-tree".to_owned()],
337+
);
338+
339+
cargo.rustflag(
340+
"-Zallow-features=proc_macro_internals,proc_macro_diagnostic,proc_macro_span",
341+
);
342+
343+
// For ./x.py clippy, don't check those targets because
344+
// linting tests and benchmarks can produce very noisy results
345+
if builder.kind != Kind::Clippy {
346+
// can't use `--all-targets` because `--examples` doesn't work well
347+
cargo.arg("--bins");
348+
cargo.arg("--tests");
349+
cargo.arg("--benches");
350+
}
351+
352+
builder.info(&format!(
353+
"Checking stage{} {} artifacts ({} -> {})",
354+
compiler.stage, "rust-analyzer", &compiler.host.triple, target.triple
355+
));
356+
run_cargo(builder, cargo, args(builder), &stamp(builder, compiler, target), vec![], true);
357+
358+
/// Cargo's output path in a given stage, compiled by a particular
359+
/// compiler for the specified target.
360+
fn stamp(builder: &Builder<'_>, compiler: Compiler, target: TargetSelection) -> PathBuf {
361+
builder.cargo_out(compiler, Mode::ToolStd, target).join(".rust-analyzer-check.stamp")
362+
}
363+
}
364+
}
365+
304366
macro_rules! tool_check_step {
305367
($name:ident, $path:literal, $($alias:literal, )* $source_type:path $(, $default:literal )?) => {
306368
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]

‎src/bootstrap/dist.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ impl Step for RustAnalyzer {
10581058
}
10591059

10601060
let rust_analyzer = builder
1061-
.ensure(tool::RustAnalyzer { compiler, target, extra_features: Vec::new() })
1061+
.ensure(tool::RustAnalyzer { compiler, target })
10621062
.expect("rust-analyzer always builds");
10631063

10641064
let mut tarball = Tarball::new(builder, "rust-analyzer", &target.triple);

‎src/bootstrap/test.rs

+58
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,64 @@ impl Step for Rls {
352352
}
353353
}
354354

355+
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
356+
pub struct RustAnalyzer {
357+
stage: u32,
358+
host: TargetSelection,
359+
}
360+
361+
impl Step for RustAnalyzer {
362+
type Output = ();
363+
const ONLY_HOSTS: bool = true;
364+
const DEFAULT: bool = true;
365+
366+
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
367+
run.path("src/tools/rust-analyzer")
368+
}
369+
370+
fn make_run(run: RunConfig<'_>) {
371+
run.builder.ensure(Self { stage: run.builder.top_stage, host: run.target });
372+
}
373+
374+
/// Runs `cargo test` for rust-analyzer
375+
fn run(self, builder: &Builder<'_>) {
376+
let stage = self.stage;
377+
let host = self.host;
378+
let compiler = builder.compiler(stage, host);
379+
380+
builder.ensure(tool::RustAnalyzer { compiler, target: self.host }).expect("in-tree tool");
381+
382+
let workspace_path = "src/tools/rust-analyzer";
383+
// until the whole RA test suite runs on `i686`, we only run
384+
// `proc-macro-srv` tests
385+
let crate_path = "src/tools/rust-analyzer/crates/proc-macro-srv";
386+
let mut cargo = tool::prepare_tool_cargo(
387+
builder,
388+
compiler,
389+
Mode::ToolStd,
390+
host,
391+
"test",
392+
crate_path,
393+
SourceType::InTree,
394+
&["sysroot-abi".to_owned()],
395+
);
396+
397+
let dir = builder.src.join(workspace_path);
398+
// needed by rust-analyzer to find its own text fixtures, cf.
399+
// https://github.com/rust-analyzer/expect-test/issues/33
400+
cargo.env("CARGO_WORKSPACE_DIR", &dir);
401+
402+
// RA's test suite tries to write to the source directory, that can't
403+
// work in Rust CI
404+
cargo.env("SKIP_SLOW_TESTS", "1");
405+
406+
cargo.add_rustc_lib_path(builder, compiler);
407+
cargo.arg("--").args(builder.config.cmd.test_args());
408+
409+
builder.run(&mut cargo.into());
410+
}
411+
}
412+
355413
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
356414
pub struct Rustfmt {
357415
stage: u32,

‎src/bootstrap/tool.rs

+45-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::collections::HashSet;
22
use std::env;
33
use std::fs;
4-
use std::path::{Path, PathBuf};
4+
use std::path::PathBuf;
55
use std::process::Command;
66

77
use crate::builder::{Builder, Cargo as CargoCommand, RunConfig, ShouldRun, Step};
@@ -683,6 +683,50 @@ impl Step for LldWrapper {
683683
}
684684
}
685685

686+
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
687+
pub struct RustAnalyzer {
688+
pub compiler: Compiler,
689+
pub target: TargetSelection,
690+
}
691+
692+
impl Step for RustAnalyzer {
693+
type Output = Option<PathBuf>;
694+
const DEFAULT: bool = true;
695+
const ONLY_HOSTS: bool = false;
696+
697+
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
698+
let builder = run.builder;
699+
run.path("src/tools/rust-analyzer").default_condition(
700+
builder.config.extended
701+
&& builder
702+
.config
703+
.tools
704+
.as_ref()
705+
.map_or(true, |tools| tools.iter().any(|tool| tool == "rust-analyzer")),
706+
)
707+
}
708+
709+
fn make_run(run: RunConfig<'_>) {
710+
run.builder.ensure(RustAnalyzer {
711+
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
712+
target: run.target,
713+
});
714+
}
715+
716+
fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
717+
builder.ensure(ToolBuild {
718+
compiler: self.compiler,
719+
target: self.target,
720+
tool: "rust-analyzer",
721+
mode: Mode::ToolStd,
722+
path: "src/tools/rust-analyzer",
723+
extra_features: vec!["rust-analyzer/in-rust-tree".to_owned()],
724+
is_optional_tool: false,
725+
source_type: SourceType::InTree,
726+
})
727+
}
728+
}
729+
686730
macro_rules! tool_extended {
687731
(($sel:ident, $builder:ident),
688732
$($name:ident,
@@ -780,7 +824,6 @@ tool_extended!((self, builder),
780824
// and this is close enough for now.
781825
RustDemangler, rust_demangler, "src/tools/rust-demangler", "rust-demangler", stable=false, in_tree=true, tool_std=true, {};
782826
Rustfmt, rustfmt, "src/tools/rustfmt", "rustfmt", stable=true, in_tree=true, {};
783-
RustAnalyzer, rust_analyzer, "src/tools/rust-analyzer/crates/rust-analyzer", "rust-analyzer", stable=true, submodule="rust-analyzer", {};
784827
);
785828

786829
impl<'a> Builder<'a> {

‎src/tools/rust-analyzer

-1
This file was deleted.

‎src/tools/rust-analyzer/.cargo/config.toml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[alias]
2+
xtask = "run --package xtask --bin xtask --"
3+
tq = "test -- -q"
4+
qt = "tq"
5+
lint = "clippy --all-targets -- -Aclippy::collapsible_if -Aclippy::needless_pass_by_value -Aclippy::nonminimal_bool -Aclippy::redundant_pattern_matching --cap-lints warn"
6+
7+
[target.x86_64-pc-windows-msvc]
8+
linker = "rust-lld"
9+
10+
[env]
11+
CARGO_WORKSPACE_DIR = { value = "", relative = true }

‎src/tools/rust-analyzer/.editorconfig

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# https://EditorConfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
trim_trailing_whitespace = true
7+
end_of_line = lf
8+
insert_final_newline = true
9+
indent_style = space
10+
11+
[*.{rs,toml}]
12+
indent_size = 4
13+
14+
[*.ts]
15+
indent_size = 4
16+
[*.js]
17+
indent_size = 4
18+
[*.json]
19+
indent_size = 4

‎src/tools/rust-analyzer/.git-blame-ignore-revs

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# for this file to take effect make sure you use git ^2.23 and
2+
# add ignoreFile to your git configuration:
3+
# ```
4+
# git config --global blame.ignoreRevsFile .git-blame-ignore-revs
5+
# ```
6+
7+
# prettier format
8+
f247090558c9ba3c551566eae5882b7ca865225f

‎src/tools/rust-analyzer/.gitattributes

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
* text=auto eol=lf
2+
3+
# git grep shouldn't match entries in this benchmark data
4+
bench_data/** binary
5+
6+
# Older git versions try to fix line endings on images, this prevents it.
7+
*.png binary
8+
*.jpg binary
9+
*.ico binary

‎src/tools/rust-analyzer/.github/ISSUE_TEMPLATE/blank_issue.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: Blank Issue
3+
about: Create a blank issue.
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+

‎src/tools/rust-analyzer/.github/ISSUE_TEMPLATE/bug_report.md

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
name: Bug report
3+
about: Create a bug report for rust-analyzer.
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
Troubleshooting guide: https://rust-analyzer.github.io/manual.html#troubleshooting
12+
Forum for questions: https://users.rust-lang.org/c/ide/14
13+
14+
Before submitting, please make sure that you're not running into one of these known issues:
15+
16+
1. extension doesn't load in VSCodium: #11080
17+
2. on-the-fly diagnostics are mostly unimplemented (`cargo check` diagnostics will be shown when saving a file): #3107
18+
19+
Otherwise please try to provide information which will help us to fix the issue faster. Minimal reproducible examples with few dependencies are especially lovely <3.
20+
-->
21+
22+
**rust-analyzer version**: (eg. output of "Rust Analyzer: Show RA Version" command)
23+
24+
**rustc version**: (eg. output of `rustc -V`)
25+
26+
**relevant settings**: (eg. client settings, or environment variables like `CARGO`, `RUSTUP_HOME` or `CARGO_HOME`)

‎src/tools/rust-analyzer/.github/ISSUE_TEMPLATE/critical_nightly_regression.md

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Critical Nightly Regression
3+
about: You are using nightly rust-analyzer and the latest version is unusable.
4+
title: ''
5+
labels: ''
6+
assignees: 'matklad'
7+
8+
---
9+
10+
<!--
11+
Troubleshooting guide: https://rust-analyzer.github.io/manual.html#troubleshooting
12+
13+
Please try to provide information which will help us to fix the issue faster. Minimal reproducible examples with few dependencies are especially lovely <3.
14+
-->
15+
16+
This is a serious regression in nightly and it's important to fix it before the next release.
17+
@matklad, please take a look.

‎src/tools/rust-analyzer/.github/actions/github-release/Dockerfile

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM node:slim
2+
3+
COPY . /action
4+
WORKDIR /action
5+
6+
RUN npm install --production
7+
8+
ENTRYPOINT ["node", "/action/main.js"]

‎src/tools/rust-analyzer/.github/actions/github-release/README.md

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# github-release
2+
3+
Copy-pasted from
4+
https://github.com/bytecodealliance/wasmtime/tree/8acfdbdd8aa550d1b84e0ce1e6222a6605d14e38/.github/actions/github-release
5+
6+
An action used to publish GitHub releases for `wasmtime`.
7+
8+
As of the time of this writing there's a few actions floating around which
9+
perform github releases but they all tend to have their set of drawbacks.
10+
Additionally nothing handles deleting releases which we need for our rolling
11+
`dev` release.
12+
13+
To handle all this this action rolls-its-own implementation using the
14+
actions/toolkit repository and packages published there. These run in a Docker
15+
container and take various inputs to orchestrate the release from the build.
16+
17+
More comments can be found in `main.js`.
18+
19+
Testing this is really hard. If you want to try though run `npm install` and
20+
then `node main.js`. You'll have to configure a bunch of env vars though to get
21+
anything reasonably working.

0 commit comments

Comments
 (0)