Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

More convenient run_with_output

Browse source
This commit is contained in:
Aleksey Kladov 2020-02-10 15:16:07 +01:00
parent 33df947d62
commit 1b6acc391a
3 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xtask/src/cmd.rs
View file

@ -18,7 +18,7 @@ impl Cmd<'_> {
run(self.unix, self.work_dir) run(self.unix, self.work_dir)
} }
} }
pub fn run_with_output(self) -> Result<Output> { pub fn run_with_output(self) -> Result<String> {
if cfg!(windows) { if cfg!(windows) {
run_with_output(self.windows, self.work_dir) run_with_output(self.windows, self.work_dir)
} else { } else {
@ -34,8 +34,10 @@ pub fn run(cmdline: &str, dir: &str) -> Result<()> {
.map(|_| ()) .map(|_| ())
} }
pub fn run_with_output(cmdline: &str, dir: &str) -> Result<Output> { pub fn run_with_output(cmdline: &str, dir: &str) -> Result<String> {
do_run(cmdline, dir, &mut |_| {}) let output = do_run(cmdline, dir, &mut |_| {})?;
let stdout = String::from_utf8(output.stdout)?;
Ok(stdout)
} }
fn do_run(cmdline: &str, dir: &str, f: &mut dyn FnMut(&mut Command)) -> Result<Output> { fn do_run(cmdline: &str, dir: &str, f: &mut dyn FnMut(&mut Command)) -> Result<Output> {

9
xtask/src/install.rs
View file

@ -127,15 +127,12 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
} }
.run()?; .run()?;
let installed_extensions = { let installed_extensions = Cmd {
let output = Cmd {
unix: &format!(r"{} --list-extensions", code_binary), unix: &format!(r"{} --list-extensions", code_binary),
windows: &format!(r"cmd.exe /c {}.cmd --list-extensions", code_binary), windows: &format!(r"cmd.exe /c {}.cmd --list-extensions", code_binary),
work_dir: ".", work_dir: ".",
} }
.run_with_output()?; .run_with_output()?;
String::from_utf8(output.stdout)?
};
if !installed_extensions.contains("rust-analyzer") { if !installed_extensions.contains("rust-analyzer") {
anyhow::bail!( anyhow::bail!(
@ -161,14 +158,12 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
fn install_server(opts: ServerOpt) -> Result<()> { fn install_server(opts: ServerOpt) -> Result<()> {
let mut old_rust = false; let mut old_rust = false;
if let Ok(output) = run_with_output("cargo --version", ".") { if let Ok(stdout) = run_with_output("cargo --version", ".") {
if let Ok(stdout) = String::from_utf8(output.stdout) {
println!("{}", stdout); println!("{}", stdout);
if !check_version(&stdout, REQUIRED_RUST_VERSION) { if !check_version(&stdout, REQUIRED_RUST_VERSION) {
old_rust = true; old_rust = true;
} }
} }
}
if old_rust { if old_rust {
eprintln!( eprintln!(

2
xtask/src/pre_commit.rs
View file

@ -14,7 +14,7 @@ pub fn run_hook() -> Result<()> {
let diff = run_with_output("git diff --diff-filter=MAR --name-only --cached", ".")?; let diff = run_with_output("git diff --diff-filter=MAR --name-only --cached", ".")?;
let root = project_root(); let root = project_root();
for line in String::from_utf8(diff.stdout)?.lines() { for line in diff.lines() {
run(&format!("git update-index --add {}", root.join(line).to_string_lossy()), ".")?; run(&format!("git update-index --add {}", root.join(line).to_string_lossy()), ".")?;
} }