squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Stronger Types

Browse source
This commit is contained in:
Aleksey Kladov 2020-02-17 18:02:59 +01:00
parent 017f0e4e53
commit a51b2603f9
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@ mod analysis_stats;
mod analysis_bench; mod analysis_bench;
mod progress_report; mod progress_report;
use std::{error::Error, fmt::Write, io::Read}; use std::{error::Error, fmt::Write, io::Read, path::PathBuf};
use pico_args::Arguments; use pico_args::Arguments;
use ra_ide::{file_structure, Analysis}; use ra_ide::{file_structure, Analysis};
@ -60,11 +60,11 @@ enum Command {
memory_usage: bool, memory_usage: bool,
only: Option<String>, only: Option<String>,
with_deps: bool, with_deps: bool,
path: String, path: PathBuf,
}, },
Bench { Bench {
verbose: bool, verbose: bool,
path: String, path: PathBuf,
op: analysis_bench::Op, op: analysis_bench::Op,
}, },
HelpPrinted, HelpPrinted,
@ -180,7 +180,7 @@ ARGS:
if trailing.len() != 1 { if trailing.len() != 1 {
Err("Invalid flags")?; Err("Invalid flags")?;
} }
trailing.pop().unwrap() trailing.pop().unwrap().into()
}; };
Command::Stats { verbosity, randomize, memory_usage, only, with_deps, path } Command::Stats { verbosity, randomize, memory_usage, only, with_deps, path }
@ -209,7 +209,7 @@ ARGS:
} }
let verbose = matches.contains(["-v", "--verbose"]); let verbose = matches.contains(["-v", "--verbose"]);
let path: String = matches.opt_value_from_str("--path")?.unwrap_or_default(); let path: PathBuf = matches.opt_value_from_str("--path")?.unwrap_or_default();
let highlight_path: Option<String> = matches.opt_value_from_str("--highlight")?; let highlight_path: Option<String> = matches.opt_value_from_str("--highlight")?;
let complete_path: Option<String> = matches.opt_value_from_str("--complete")?; let complete_path: Option<String> = matches.opt_value_from_str("--complete")?;
let goto_def_path: Option<String> = matches.opt_value_from_str("--goto-def")?; let goto_def_path: Option<String> = matches.opt_value_from_str("--goto-def")?;