Rewrite to use derive macro
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
parent
d5eb918523
commit
5f5ce54edb
2 changed files with 4 additions and 9 deletions
|
@ -37,17 +37,17 @@
|
|||
while_true,
|
||||
)]
|
||||
|
||||
#[macro_use] extern crate log;
|
||||
extern crate log;
|
||||
extern crate itertools;
|
||||
extern crate ansi_term;
|
||||
extern crate handlebars;
|
||||
extern crate serde;
|
||||
#[macro_use] extern crate serde_derive;
|
||||
#[macro_use] extern crate failure;
|
||||
#[macro_use] extern crate toml_query;
|
||||
|
||||
extern crate clap;
|
||||
extern crate toml;
|
||||
extern crate toml_query;
|
||||
extern crate atty;
|
||||
|
||||
extern crate libimagstore;
|
||||
|
|
|
@ -349,7 +349,6 @@ mod log_lvl_aggregate {
|
|||
fn aggregate_module_settings(_matches: &ArgMatches, config: Option<&Value>)
|
||||
-> Result<BTreeMap<ModuleName, ModuleSettings>>
|
||||
{
|
||||
use toml_query::read::Partial;
|
||||
use std::convert::TryInto;
|
||||
|
||||
//
|
||||
|
@ -369,14 +368,10 @@ fn aggregate_module_settings(_matches: &ArgMatches, config: Option<&Value>)
|
|||
pub enabled: bool,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
#[derive(Partial, Serialize, Deserialize, Debug)]
|
||||
#[location = "imag.logging.modules"]
|
||||
struct LoggingModuleConfigMap(BTreeMap<String, LoggingModuleConfig>);
|
||||
|
||||
impl<'a> Partial<'a> for LoggingModuleConfigMap {
|
||||
const LOCATION: &'static str = "imag.logging.modules";
|
||||
type Output = Self;
|
||||
}
|
||||
|
||||
impl TryInto<BTreeMap<String, ModuleSettings>> for LoggingModuleConfigMap {
|
||||
type Error = Error;
|
||||
|
||||
|
|
Loading…
Reference in a new issue