language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 14:51:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refactor(args): Apply comments

Browse source
This commit is contained in:
Geobert Quach 2019-09-10 16:17:11 +01:00
parent 4e94c46713
commit aa894ace1f
4 changed files with 117 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/ra_tools/src/help.rs
View file

@ -1,6 +1,4 @@
pub fn print_global_help() {
println!(
"tasks
pub const GLOBAL_HELP: &str = "tasks
USAGE:
ra_tools <SUBCOMMAND>
@ -15,13 +13,9 @@ SUBCOMMANDS:
gen-syntax
gen-tests
install-ra
lint"
)
}
lint";
pub fn print_install_ra_help() {
println!(
"ra_tools-install-ra
pub const INSTALL_RA_HELP: &str = "ra_tools-install-ra
USAGE:
ra_tools.exe install-ra [FLAGS]
@ -30,12 +24,10 @@ FLAGS:
--client-code
-h, --help Prints help information
--jemalloc
--server"
)
}
--server";
pub fn print_no_param_subcommand_help(subcommand: &str) {
println!(
eprintln!(
"ra_tools-{}
USAGE:
@ -47,10 +39,7 @@ FLAGS:
);
}
pub fn print_install_ra_conflict() {
println!(
"error: The argument `--server` cannot be used with `--client-code`
pub const INSTALL_RA_CONFLICT: &str =
"error: The argument `--server` cannot be used with `--client-code`
For more information try --help"
)
}
For more information try --help";

64
crates/ra_tools/src/main.rs
View file

@ -23,84 +23,78 @@ struct ServerOpt {
}
fn main() -> Result<()> {
let subcommand = std::env::args_os().nth(1);
if subcommand.is_none() {
help::print_global_help();
return Ok(());
}
let subcommand = subcommand.unwrap();
let subcommand = match std::env::args_os().nth(1) {
None => {
eprintln!("{}", help::GLOBAL_HELP);
return Ok(());
}
Some(s) => s,
};
let mut matches = Arguments::from_vec(std::env::args_os().skip(2).collect());
let subcommand = &*subcommand.to_string_lossy();
match subcommand {
"install-ra" | "install-code" => {
if matches.contains(["-h", "--help"]) {
help::print_install_ra_help();
eprintln!("{}", help::INSTALL_RA_HELP);
return Ok(());
} else {
let server = matches.contains("--server");
let client_code = matches.contains("--client-code");
if server && client_code {
help::print_install_ra_conflict();
return Ok(());
}
let jemalloc = matches.contains("--jemalloc");
matches.finish().or_else(handle_extra_flags)?;
let opts = InstallOpt {
client: if server { None } else { Some(ClientOpt::VsCode) },
server: if client_code { None } else { Some(ServerOpt { jemalloc: jemalloc }) },
};
install(opts)?
}
let server = matches.contains("--server");
let client_code = matches.contains("--client-code");
if server && client_code {
eprintln!("{}", help::INSTALL_RA_CONFLICT);
return Ok(());
}
let jemalloc = matches.contains("--jemalloc");
matches.finish().or_else(handle_extra_flags)?;
let opts = InstallOpt {
client: if server { None } else { Some(ClientOpt::VsCode) },
server: if client_code { None } else { Some(ServerOpt { jemalloc: jemalloc }) },
};
install(opts)?
}
"gen-tests" => {
if matches.contains(["-h", "--help"]) {
help::print_no_param_subcommand_help(&subcommand);
return Ok(());
} else {
gen_tests(Overwrite)?
}
gen_tests(Overwrite)?
}
"gen-syntax" => {
if matches.contains(["-h", "--help"]) {
help::print_no_param_subcommand_help(&subcommand);
return Ok(());
} else {
generate_boilerplate(Overwrite)?
}
generate_boilerplate(Overwrite)?
}
"format" => {
if matches.contains(["-h", "--help"]) {
help::print_no_param_subcommand_help(&subcommand);
return Ok(());
} else {
run_rustfmt(Overwrite)?
}
run_rustfmt(Overwrite)?
}
"format-hook" => {
if matches.contains(["-h", "--help"]) {
help::print_no_param_subcommand_help(&subcommand);
return Ok(());
} else {
install_format_hook()?
}
install_format_hook()?
}
"lint" => {
if matches.contains(["-h", "--help"]) {
help::print_no_param_subcommand_help(&subcommand);
return Ok(());
} else {
run_clippy()?
}
run_clippy()?
}
"fuzz-tests" => {
if matches.contains(["-h", "--help"]) {
help::print_no_param_subcommand_help(&subcommand);
return Ok(());
} else {
run_fuzzer()?
}
run_fuzzer()?
}
_ => help::print_global_help(),
_ => eprintln!("{}", help::GLOBAL_HELP),
}
Ok(())
}
@ -109,7 +103,7 @@ fn handle_extra_flags(e: pico_args::Error) -> Result<()> {
if let pico_args::Error::UnusedArgsLeft(flags) = e {
let mut invalid_flags = String::new();
for flag in flags {
write!(&mut invalid_flags, "{}, ", flag).expect("Error on write");
write!(&mut invalid_flags, "{}, ", flag)?;
}
let (invalid_flags, _) = invalid_flags.split_at(invalid_flags.len() - 2);
Err(format!("Invalid flags: {}", invalid_flags).into())