Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-10 07:04:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

initial implementation

Browse source
This commit is contained in:
Muhammad Mominul Huque 2018-10-26 19:08:21 +06:00 committed by Aleksey Kladov
parent 9b9fc135d6
commit d14610dab4
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.cargo/config
View file

@ -3,6 +3,7 @@
gen-syntax = "run --package tools -- gen-syntax" gen-syntax = "run --package tools -- gen-syntax"
gen-tests = "run --package tools -- gen-tests" gen-tests = "run --package tools -- gen-tests"
install-code = "run --package tools -- install-code" install-code = "run --package tools -- install-code"
format = "run --package tools -- format"
render-test = "run --package ra_cli -- render-test" render-test = "run --package ra_cli -- render-test"
parse = "run --package ra_cli -- parse" parse = "run --package ra_cli -- parse"

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

@ -12,9 +12,9 @@ pub use teraron::{Mode, Verify, Overwrite};
pub type Result<T> = ::std::result::Result<T, failure::Error>; pub type Result<T> = ::std::result::Result<T, failure::Error>;
pub const GRAMMAR: &str = "ra_syntax/src/grammar.ron"; pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron";
pub const SYNTAX_KINDS: &str = "ra_syntax/src/syntax_kinds/generated.rs.tera"; pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera";
pub const AST: &str = "ra_syntax/src/ast/generated.rs.tera"; pub const AST: &str = "crates/ra_syntax/src/ast/generated.rs.tera";
#[derive(Debug)] #[derive(Debug)]
pub struct Test { pub struct Test {
@ -75,7 +75,8 @@ pub fn generate(mode: Mode) -> Result<()> {
pub fn project_root() -> PathBuf { pub fn project_root() -> PathBuf {
Path::new(&std::env::var("CARGO_MANIFEST_DIR").unwrap()) Path::new(&std::env::var("CARGO_MANIFEST_DIR").unwrap())
.parent() .ancestors()
.nth(2)
.unwrap() .unwrap()
.to_path_buf() .to_path_buf()
} }

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

@ -13,7 +13,7 @@ use std::{
process::Command, process::Command,
}; };
use tools::{ use tools::{
collect_tests, Result, Test, generate, Mode, Overwrite, Verify, collect_tests, Result, Test, generate, Mode, Overwrite, Verify, project_root,
}; };
const GRAMMAR_DIR: &str = "./crates/ra_syntax/src/grammar"; const GRAMMAR_DIR: &str = "./crates/ra_syntax/src/grammar";
@ -31,6 +31,7 @@ fn main() -> Result<()> {
.subcommand(SubCommand::with_name("gen-syntax")) .subcommand(SubCommand::with_name("gen-syntax"))
.subcommand(SubCommand::with_name("gen-tests")) .subcommand(SubCommand::with_name("gen-tests"))
.subcommand(SubCommand::with_name("install-code")) .subcommand(SubCommand::with_name("install-code"))
.subcommand(SubCommand::with_name("format"))
.get_matches(); .get_matches();
let mode = if matches.is_present("verify") { let mode = if matches.is_present("verify") {
Verify Verify
@ -41,6 +42,7 @@ fn main() -> Result<()> {
("install-code", _) => install_code_extension()?, ("install-code", _) => install_code_extension()?,
("gen-tests", _) => gen_tests(mode)?, ("gen-tests", _) => gen_tests(mode)?,
("gen-syntax", _) => generate(Overwrite)?, ("gen-syntax", _) => generate(Overwrite)?,
("format", _) => run_rustfmt()?,
_ => unreachable!(), _ => unreachable!(),
} }
Ok(()) Ok(())
@ -146,12 +148,7 @@ fn install_code_extension() -> Result<()> {
fn run(cmdline: &'static str, dir: &str) -> Result<()> { fn run(cmdline: &'static str, dir: &str) -> Result<()> {
eprintln!("\nwill run: {}", cmdline); eprintln!("\nwill run: {}", cmdline);
let manifest_dir = env!("CARGO_MANIFEST_DIR"); let project_dir = project_root().join(dir);
let project_dir = Path::new(manifest_dir)
.ancestors()
.nth(2)
.unwrap()
.join(dir);
let mut args = cmdline.split_whitespace(); let mut args = cmdline.split_whitespace();
let exec = args.next().unwrap(); let exec = args.next().unwrap();
let status = Command::new(exec) let status = Command::new(exec)
@ -163,3 +160,11 @@ fn run(cmdline: &'static str, dir: &str) -> Result<()> {
} }
Ok(()) 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(())
}