language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Speedup fmt

Browse source
This commit is contained in:
Aleksey Kladov 2018-10-31 23:57:38 +03:00
parent 8f1a83b4cb
commit fabb804f30
2 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
crates/tools/src/lib.rs
View file

@ -4,7 +4,7 @@ extern crate teraron;
use std::{
path::{Path, PathBuf},
process::Command,
process::{Command, Stdio},
};
use failure::bail;
@ -92,14 +92,16 @@ pub fn run(cmdline: &str, dir: &str) -> Result<()> {
}
pub fn run_rustfmt(mode: Mode) -> Result<()> {
run(&format!("rustup install {}", TOOLCHAIN), ".")?;
run(
&format!(
"rustup component add rustfmt-preview --toolchain {}",
TOOLCHAIN
),
".",
)?;
match Command::new("rustup")
.args(&["run", TOOLCHAIN, "--", "cargo", "fmt", "--version"])
.stderr(Stdio::null())
.stdout(Stdio::null())
.status()
{
Ok(status) if status.success() => (),
_ => install_rustfmt()?,
};
if mode == Verify {
run(
&format!("rustup run {} -- cargo fmt -- --check", TOOLCHAIN),
@ -110,3 +112,14 @@ pub fn run_rustfmt(mode: Mode) -> Result<()> {
}
Ok(())
}
fn install_rustfmt() -> Result<()> {
run(&format!("rustup install {}", TOOLCHAIN), ".")?;
run(
&format!(
"rustup component add rustfmt-preview --toolchain {}",
TOOLCHAIN
),
".",
)
}