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

Various changes

Browse source 
Pin to a specific toolchain version
Format checking functionality
Add a test to check the code formatting.
Remove macro_use attribute
This commit is contained in:
Muhammad Mominul Huque 2018-11-01 01:50:43 +06:00 • committed by Aleksey Kladov
parent d14610dab4
commit 857c1650ef
3 changed files with 40 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/tools/src/main.rs
View file

@ -1,5 +1,4 @@
extern crate clap;
#[macro_use]
extern crate failure;
extern crate tools;
extern crate walkdir;
@ -10,11 +9,11 @@ use std::{
collections::HashMap,
fs,
path::{Path, PathBuf},
process::Command,
};
use tools::{
collect_tests, Result, Test, generate, Mode, Overwrite, Verify, project_root,
collect_tests, Result, Test, generate, Mode, Overwrite, Verify, run, run_rustfmt,
};
use failure::bail;
const GRAMMAR_DIR: &str = "./crates/ra_syntax/src/grammar";
const INLINE_TESTS_DIR: &str = "./crates/ra_syntax/tests/data/parser/inline";
@ -42,7 +41,7 @@ fn main() -> Result<()> {
("install-code", _) => install_code_extension()?,
("gen-tests", _) => gen_tests(mode)?,
("gen-syntax", _) => generate(Overwrite)?,
("format", _) => run_rustfmt()?,
("format", _) => run_rustfmt(Overwrite)?,
_ => unreachable!(),
}
Ok(())
@ -145,26 +144,3 @@ fn install_code_extension() -> Result<()> {
}
Ok(())
}
fn run(cmdline: &'static str, dir: &str) -> Result<()> {
eprintln!("\nwill run: {}", cmdline);
let project_dir = project_root().join(dir);
let mut args = cmdline.split_whitespace();
let exec = args.next().unwrap();
let status = Command::new(exec)
.args(args)
.current_dir(project_dir)
.status()?;
if !status.success() {
bail!("`{}` exited with {}", cmdline, status);
}
Ok(())
}
fn run_rustfmt() -> Result<()> {
// Use beta toolchain for 2018 edition.
run("rustup install beta", ".")?;
run("rustup component add rustfmt-preview --toolchain beta", ".")?;
run("rustup run beta -- cargo fmt", ".")?;
Ok(())
}