Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 01:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #1265

Browse source 
1265: drop obsolete render test subcommand r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-05-12 18:01:28 +00:00
commit 02ba107bbf
2 changed files with 7 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_cli/src/analysis_stats.rs
View file

@ -7,9 +7,9 @@ use ra_syntax::AstNode;
use crate::Result;
pub fn run(verbose: bool, only: Option<&str>) -> Result<()> {
pub fn run(verbose: bool, path: &str, only: Option<&str>) -> Result<()> {
let db_load_time = Instant::now();
let (db, roots) = BatchDatabase::load_cargo(".")?;
let (db, roots) = BatchDatabase::load_cargo(path)?;
println!("Database loaded, {} roots, {:?}", roots.len(), db_load_time.elapsed());
let analysis_time = Instant::now();
let mut num_crates = 0;

37
crates/ra_cli/src/main.rs
View file

@ -1,11 +1,10 @@
mod analysis_stats;
use std::{fs, io::Read, path::Path};
use std::io::Read;
use clap::{App, Arg, SubCommand};
use ra_ide_api::file_structure;
use ra_syntax::{SourceFile, TreeArc, AstNode};
use tools::collect_tests;
use flexi_logger::Logger;
use ra_prof::profile;
@ -15,17 +14,13 @@ fn main() -> Result<()> {
Logger::with_env().start()?;
let matches = App::new("ra-cli")
.setting(clap::AppSettings::SubcommandRequiredElseHelp)
.subcommand(
SubCommand::with_name("render-test")
.arg(Arg::with_name("line").long("--line").required(true).takes_value(true))
.arg(Arg::with_name("file").long("--file").required(true).takes_value(true)),
)
.subcommand(SubCommand::with_name("parse").arg(Arg::with_name("no-dump").long("--no-dump")))
.subcommand(SubCommand::with_name("symbols"))
.subcommand(
SubCommand::with_name("analysis-stats")
.arg(Arg::with_name("verbose").short("v"))
.arg(Arg::with_name("only").short("o").takes_value(true)),
.arg(Arg::with_name("only").short("o").takes_value(true))
.arg(Arg::with_name("path")),
)
.get_matches();
match matches.subcommand() {
@ -43,18 +38,11 @@ fn main() -> Result<()> {
println!("{:?}", s);
}
}
("render-test", Some(matches)) => {
let file = matches.value_of("file").unwrap();
let file = Path::new(file);
let line: usize = matches.value_of("line").unwrap().parse()?;
let line = line - 1;
let (test, tree) = render_test(file, line)?;
println!("{}\n{}", test, tree);
}
("analysis-stats", Some(matches)) => {
let verbose = matches.is_present("verbose");
let path = matches.value_of("path").unwrap_or("");
let only = matches.value_of("only");
analysis_stats::run(verbose, only)?;
analysis_stats::run(verbose, path, only)?;
}
_ => unreachable!(),
}
@ -71,18 +59,3 @@ fn read_stdin() -> Result<String> {
::std::io::stdin().read_to_string(&mut buff)?;
Ok(buff)
}
fn render_test(file: &Path, line: usize) -> Result<(String, String)> {
let text = fs::read_to_string(file)?;
let tests = collect_tests(&text);
let test = tests.into_iter().find(|(start_line, t)| {
*start_line <= line && line <= *start_line + t.text.lines().count()
});
let test = match test {
None => failure::bail!("No test found at line {} at {}", line, file.display()),
Some((_start_line, test)) => test,
};
let file = SourceFile::parse(&test.text);
let tree = file.syntax().debug_dump();
Ok((test.text, tree))
}