github/awatcher
1
1
Fork 0
mirror of https://github.com/2e3s/awatcher.git synced 2025-06-05 19:15:33 +00:00
Code Issues 17 Packages Projects Releases Wiki Activity

Remove avoidable clones

Browse Source
This commit is contained in:
Demmie 2023-04-23 02:13:39 -04:00
parent 97a5867df7
commit 534c8dc984
No known key found for this signature in database
GPG Key ID: B06DAA3D432C6E9A
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.rs
View File

@ -57,7 +57,7 @@ impl Config {
Ok(Self {
port: config.server.port,
host: config.server.host.clone(),
host: config.server.host,
idle_timeout: config.client.get_idle_timeout(),
poll_time_idle: config.client.get_poll_time_idle(),
poll_time_window: config.client.get_poll_time_window(),

27
src/config/file_config.rs
View File

@ -125,31 +125,32 @@ impl FileConfig {
}
fn merge_cli(&mut self, matches: &ArgMatches) {
self.client.poll_time_idle_seconds = get_arg_value(
get_arg_value(
"poll-time-idle",
matches,
self.client.poll_time_idle_seconds,
&mut self.client.poll_time_idle_seconds,
);
self.client.poll_time_window_seconds = get_arg_value(
get_arg_value(
"poll-time-window",
matches,
self.client.poll_time_window_seconds,
&mut self.client.poll_time_window_seconds,
);
self.client.idle_timeout_seconds =
get_arg_value("idle-timeout", matches, self.client.idle_timeout_seconds);
self.server.port = get_arg_value("port", matches, self.server.port);
self.server.host = get_arg_value("host", matches, self.server.host.clone());
get_arg_value(
"idle-timeout",
matches,
&mut self.client.idle_timeout_seconds,
);
get_arg_value("port", matches, &mut self.server.port);
get_arg_value("host", matches, &mut self.server.host);
}
}
fn get_arg_value<T>(id: &str, matches: &ArgMatches, config_value: T) -> T
fn get_arg_value<T>(id: &str, matches: &ArgMatches, config_value: &mut T)
where
T: Clone + Send + Sync + 'static,
{
if let Some(ValueSource::CommandLine) = matches.value_source(id) {
matches.get_one::<T>(id).unwrap().clone()
} else {
config_value
let value = &mut matches.get_one::<T>(id).unwrap().clone();
std::mem::swap(config_value, value);
}
}