Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow xtask::reformat to work without rustup

Browse source
This commit is contained in:
Lukas Wirth 2024-08-30 16:17:45 +02:00
parent 38c1d6e337
commit 3ad54a74ab
1 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
xtask/src/codegen.rs
View file

@ -126,27 +126,35 @@ impl fmt::Display for Location {
}
}
fn ensure_rustfmt(sh: &Shell) {
fn reformat(text: String) -> String {
let sh = Shell::new().unwrap();
let rustfmt_toml = project_root().join("rustfmt.toml");
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,
// then plain rustfmt in case rustup isn't being used to manage the compiler (e.g. when using Nix).
let mut stdout = if !version.contains("stable") {
let version = cmd!(sh, "rustfmt --version").read().unwrap_or_default();
if !version.contains("stable") {
panic!(
"Failed to run rustfmt from toolchain 'stable'. \
Please run `rustup component add rustfmt --toolchain stable` to install it.",
);
} else {
cmd!(sh, "rustfmt --config-path {rustfmt_toml} --config fn_single_line=true")
.stdin(text)
.read()
.unwrap()
}
}
fn reformat(text: String) -> String {
let sh = Shell::new().unwrap();
ensure_rustfmt(&sh);
let rustfmt_toml = project_root().join("rustfmt.toml");
let mut stdout = cmd!(
} else {
cmd!(
sh,
"rustup run stable rustfmt --config-path {rustfmt_toml} --config fn_single_line=true"
)
.stdin(text)
.read()
.unwrap();
.unwrap()
};
if !stdout.ends_with('\n') {
stdout.push('\n');
}