matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

[Auto] bin/core/category: 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:39:13 +02:00 committed by Matthias Beyer
parent 40c1f12b25
commit 25e5936b08
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bin/core/imag-category/src/main.rs
View file

@ -103,7 +103,7 @@ fn set(rt: &Runtime) {
}) })
.into_iter(); .into_iter();
StoreIdIterator::new(Box::new(sids.into_iter().map(Ok))) StoreIdIterator::new(Box::new(sids.map(Ok)))
.into_get_iter(rt.store()) .into_get_iter(rt.store())
.trace_unwrap_exit() .trace_unwrap_exit()
.map(|o| o.unwrap_or_else(|| { .map(|o| o.unwrap_or_else(|| {
@ -111,7 +111,7 @@ fn set(rt: &Runtime) {
::std::process::exit(1) ::std::process::exit(1)
})) }))
.for_each(|mut entry| { .for_each(|mut entry| {
let _ = entry entry
.set_category_checked(rt.store(), &name) .set_category_checked(rt.store(), &name)
.map_err_trace_exit_unwrap(); .map_err_trace_exit_unwrap();
}) })
@ -129,7 +129,7 @@ fn get(rt: &Runtime) {
}) })
.into_iter(); .into_iter();
StoreIdIterator::new(Box::new(sids.into_iter().map(Ok))) StoreIdIterator::new(Box::new(sids.map(Ok)))
.into_get_iter(rt.store()) .into_get_iter(rt.store())
.trace_unwrap_exit() .trace_unwrap_exit()
.map(|o| o.unwrap_or_else(|| { .map(|o| o.unwrap_or_else(|| {
@ -138,7 +138,7 @@ fn get(rt: &Runtime) {
})) }))
.map(|entry| entry.get_category().map_err_trace_exit_unwrap()) .map(|entry| entry.get_category().map_err_trace_exit_unwrap())
.for_each(|name| { .for_each(|name| {
let _ = writeln!(outlock, "{}", name).to_exit_code().unwrap_or_exit(); writeln!(outlock, "{}", name).to_exit_code().unwrap_or_exit();
}) })
} }
@ -190,7 +190,7 @@ fn delete_category(rt: &Runtime) {
if answer { if answer {
info!("Deleting category '{}'", name); info!("Deleting category '{}'", name);
let _ = rt rt
.store() .store()
.delete_category(&name) .delete_category(&name)
.map_err_trace_exit_unwrap(); .map_err_trace_exit_unwrap();

1
bin/core/imag-category/src/ui.rs
View file

@ -111,7 +111,6 @@ impl IdPathProvider for PathProvider {
fn get_id_paths(field: &str, subm: &ArgMatches) -> Result<Option<Vec<StoreId>>> { fn get_id_paths(field: &str, subm: &ArgMatches) -> Result<Option<Vec<StoreId>>> {
subm.values_of(field) subm.values_of(field)
.map(|v| v .map(|v| v
.into_iter()
.map(PathBuf::from) .map(PathBuf::from)
.map(|pb| pb.into_storeid()) .map(|pb| pb.into_storeid())
.collect::<Result<Vec<_>>>() .collect::<Result<Vec<_>>>()