language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Auto merge of #17975 - IvarWithoutBones:dont-assume-rustup, r=Veykril

Browse source 
fix: do not assume rustup is installed in xtask codegen

When formatting generated code the xtask crate attempts to run `rustup run stable rustfmt`, which fails if `rustup` is not installed. This results in test failures when another source manages the compiler toolchain, for example when using Nix (or any other distro-specific packaging solution):
* xtask::codegen::grammar::test
* xtask::codegen::assists_doc_tests::test

With this PR xtask will first attempt to run `rustup run stable rustfmt`, and if that fails just plain `rustfmt`. It still validates a stable version is being used. This allows `cargo test` to pass on systems that do not use `rustup`.
This commit is contained in:
bors 2024-08-29 10:27:39 +00:00
commit b3fa443eb2
1 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
xtask/src/codegen.rs
View file

@ -126,24 +126,28 @@ impl fmt::Display for Location {
} }
} }
fn ensure_rustfmt(sh: &Shell) { fn rustfmt_executable(sh: &Shell) -> &str {
let version = cmd!(sh, "rustup run stable rustfmt --version").read().unwrap_or_default(); // First try explicitly requesting the stable channel via rustup in case nightly is being used by default,
if !version.contains("stable") { // then plain rustfmt in case rustup isn't being used to manage the compiler (e.g. when using Nix).
for executable in ["rustup run stable rustfmt", "rustfmt"] {
let version = cmd!(sh, "{executable} --version").read().unwrap_or_default();
if version.contains("stable") {
return executable;
}
}
panic!( panic!(
"Failed to run rustfmt from toolchain 'stable'. \ "Failed to run rustfmt from toolchain 'stable'. \
Please run `rustup component add rustfmt --toolchain stable` to install it.", Please run `rustup component add rustfmt --toolchain stable` to install it.",
); );
}
} }
fn reformat(text: String) -> String { fn reformat(text: String) -> String {
let sh = Shell::new().unwrap(); let sh = Shell::new().unwrap();
ensure_rustfmt(&sh); let rustfmt_exe = rustfmt_executable(&sh);
let rustfmt_toml = project_root().join("rustfmt.toml"); let rustfmt_toml = project_root().join("rustfmt.toml");
let mut stdout = cmd!( let mut stdout =
sh, cmd!(sh, "{rustfmt_exe} --config-path {rustfmt_toml} --config fn_single_line=true")
"rustup run stable rustfmt --config-path {rustfmt_toml} --config fn_single_line=true"
)
.stdin(text) .stdin(text)
.read() .read()
.unwrap(); .unwrap();