Skip to content

Commit

Permalink
refactor: rename to warns
Browse files Browse the repository at this point in the history
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
  • Loading branch information
Rustin170506 committed Nov 29, 2023
1 parent ce90b5f commit d87d160
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions tokio-console/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ impl FromStr for LogFilter {
struct ConfigFile {
default_target_addr: Option<String>,
log: Option<String>,
linters: Vec<KnownWarnings>,
warns: Vec<KnownWarnings>,
log_directory: Option<PathBuf>,
retention: Option<RetainFor>,
charset: Option<CharsetConfig>,
Expand Down Expand Up @@ -481,11 +481,11 @@ impl Config {
target_addr: other.target_addr.or(self.target_addr),
log_filter: other.log_filter.or(self.log_filter),
warns: {
let mut linters = other.warns;
linters.extend(self.warns);
linters.sort_unstable();
linters.dedup();
linters
let mut warns: Vec<KnownWarnings> = other.warns;
warns.extend(self.warns);
warns.sort_unstable();
warns.dedup();
warns
},
retain_for: other.retain_for.or(self.retain_for),
view_options: self.view_options.merge_with(other.view_options),
Expand Down Expand Up @@ -741,7 +741,7 @@ impl From<Config> for ConfigFile {
default_target_addr: config.target_addr.map(|addr| addr.to_string()),
log: config.log_filter.map(|filter| filter.to_string()),
log_directory: config.log_directory,
linters: config.warns,
warns: config.warns,
retention: config.retain_for,
charset: Some(CharsetConfig {
lang: config.view_options.lang,
Expand All @@ -764,7 +764,7 @@ impl TryFrom<ConfigFile> for Config {
Ok(Config {
target_addr: value.target_addr()?,
log_filter: value.log_filter()?,
warns: value.linters.clone(),
warns: value.warns.clone(),
log_directory: value.log_directory.take(),
retain_for: value.retain_for(),
view_options: ViewOptions {
Expand Down

0 comments on commit d87d160

Please sign in to comment.