matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

[No-auto] bin/core/tag: Fix Clippy warnings

Browse source 
Signed-off-by: flip1995 <hello@philkrones.com>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
flip1995 2019-08-27 10:32:30 +02:00 committed by Matthias Beyer
parent a2d3a8cffc
commit 42f6a3040d
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bin/core/imag-tag/src/main.rs
View file

@ -93,9 +93,8 @@ fn main() {
}) })
.into_iter(); .into_iter();
rt.cli() if let Some(name) = rt.cli().subcommand_name() {
.subcommand_name() match name {
.map(|name| match name {
"list" => for id in ids { "list" => for id in ids {
list(id, &rt) list(id, &rt)
}, },
@ -118,7 +117,8 @@ fn main() {
.code() .code()
.map(::std::process::exit); .map(::std::process::exit);
}, },
}); }
}
} }
fn alter(rt: &Runtime, path: StoreId, add: Option<Vec<Tag>>, rem: Option<Vec<Tag>>) { fn alter(rt: &Runtime, path: StoreId, add: Option<Vec<Tag>>, rem: Option<Vec<Tag>>) {
@ -126,7 +126,7 @@ fn alter(rt: &Runtime, path: StoreId, add: Option<Vec<Tag>>, rem: Option<Vec<Tag
Ok(Some(mut e)) => { Ok(Some(mut e)) => {
debug!("Entry header now = {:?}", e.get_header()); debug!("Entry header now = {:?}", e.get_header());
add.map(|tags| { if let Some(tags) = add {
debug!("Adding tags = '{:?}'", tags); debug!("Adding tags = '{:?}'", tags);
for tag in tags { for tag in tags {
debug!("Adding tag '{:?}'", tag); debug!("Adding tag '{:?}'", tag);
@ -136,11 +136,11 @@ fn alter(rt: &Runtime, path: StoreId, add: Option<Vec<Tag>>, rem: Option<Vec<Tag
debug!("Adding tag worked"); debug!("Adding tag worked");
} }
} }
}); // it is okay to ignore a None here } // it is okay to ignore a None here
debug!("Entry header now = {:?}", e.get_header()); debug!("Entry header now = {:?}", e.get_header());
rem.map(|tags| { if let Some(tags) = rem {
debug!("Removing tags = '{:?}'", tags); debug!("Removing tags = '{:?}'", tags);
for tag in tags { for tag in tags {
debug!("Removing tag '{:?}'", tag); debug!("Removing tag '{:?}'", tag);
@ -148,7 +148,7 @@ fn alter(rt: &Runtime, path: StoreId, add: Option<Vec<Tag>>, rem: Option<Vec<Tag
trace_error(&e); trace_error(&e);
} }
} }
}); // it is okay to ignore a None here } // it is okay to ignore a None here
debug!("Entry header now = {:?}", e.get_header()); debug!("Entry header now = {:?}", e.get_header());
@ -285,7 +285,7 @@ mod tests {
entry.get_header().read(&"tag.values".to_owned()).map_err(Error::from) entry.get_header().read(&"tag.values".to_owned()).map_err(Error::from)
} }
fn tags_toml_value<'a, I: IntoIterator<Item = &'static str>>(tags: I) -> Value { fn tags_toml_value<I: IntoIterator<Item = &'static str>>(tags: I) -> Value {
Value::Array(tags.into_iter().map(|s| Value::String(s.to_owned())).collect()) Value::Array(tags.into_iter().map(|s| Value::String(s.to_owned())).collect())
} }