YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli_helpers: run_with_cli_and_config: rename function and "f" argument

Browse source
This commit is contained in:
Joakim Frostegård 2020-04-11 14:19:46 +02:00
parent 688372bdf2
commit 834a8c3fa2
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aquatic/src/bin/aquatic.rs
View file

@ -7,7 +7,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
fn main(){
cli_helpers::run_with_cli_and_config::<aquatic::config::Config>(
cli_helpers::run_app_with_cli_and_config::<aquatic::config::Config>(
"aquatic: udp bittorrent tracker",
aquatic::run,
)

8
cli_helpers/src/lib.rs
View file

@ -36,10 +36,10 @@ fn default_config_as_toml<T>() -> String
}
pub fn run_with_cli_and_config<T>(
pub fn run_app_with_cli_and_config<T>(
title: &str,
// Function that takes config file and runs application
f: fn(T),
app_fn: fn(T),
) where T: Default + Serialize + DeserializeOwned {
let args: Vec<String> = ::std::env::args().collect();
@ -51,7 +51,7 @@ pub fn run_with_cli_and_config<T>(
print!("{}", default_config_as_toml::<T>());
} else if let Some(config_file) = opts.config_file {
match config_from_toml_file(config_file){
Ok(config) => f(config),
Ok(config) => app_fn(config),
Err(err) => {
eprintln!("Error while reading config file: {}", err);
@ -59,7 +59,7 @@ pub fn run_with_cli_and_config<T>(
}
}
} else {
f(T::default())
app_fn(T::default())
}
},
Err(err) => {