diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2019-02-28 17:28:32 +0100 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2019-05-18 00:20:59 +0200 |
commit | 1d8984461395c37fdbcd59a0b9488b076084c89a (patch) | |
tree | b98795420280291c9dc2a9d56229b9af593f2bcb /bin | |
parent | 51daf28509b913a8159ad3a097304645db7e263f (diff) |
Run 'cargo fix' for rust-2018
With this patch we move the codebase to Rust-2018.
The diff was generated by executing
cargo fix --all --all-features --edition
on the codebase.
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'bin')
30 files changed, 71 insertions, 71 deletions
diff --git a/bin/core/imag-annotate/src/main.rs b/bin/core/imag-annotate/src/main.rs index ada33757..f4ad2093 100644 --- a/bin/core/imag-annotate/src/main.rs +++ b/bin/core/imag-annotate/src/main.rs @@ -97,7 +97,7 @@ fn main() { fn add(rt: &Runtime) { let scmd = rt.cli().subcommand_matches("add").unwrap(); // safed by main() - let mut ids = rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap().into_iter(); + let mut ids = rt.ids::<crate::ui::PathProvider>().map_err_trace_exit_unwrap().into_iter(); if let Some(first) = ids.next() { let mut annotation = rt.store() @@ -144,7 +144,7 @@ fn remove(rt: &Runtime) { let scmd = rt.cli().subcommand_matches("remove").unwrap(); // safed by main() let annotation_name = scmd.value_of("annotation_name").unwrap(); // safed by clap let delete = scmd.is_present("delete-annotation"); - let ids = rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap(); + let ids = rt.ids::<crate::ui::PathProvider>().map_err_trace_exit_unwrap(); ids.into_iter().for_each(|id| { let mut entry = rt.store() @@ -181,7 +181,7 @@ fn remove(rt: &Runtime) { fn list(rt: &Runtime) { let scmd = rt.cli().subcommand_matches("list").unwrap(); // safed by clap let with_text = scmd.is_present("list-with-text"); - let ids = rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap(); + let ids = rt.ids::<crate::ui::PathProvider>().map_err_trace_exit_unwrap(); if ids.len() != 0 { let _ = ids diff --git a/bin/core/imag-category/src/main.rs b/bin/core/imag-category/src/main.rs index 96882e41..9629da7f 100644 --- a/bin/core/imag-category/src/main.rs +++ b/bin/core/imag-category/src/main.rs @@ -92,7 +92,7 @@ fn main() { fn set(rt: &Runtime) { let scmd = rt.cli().subcommand_matches("set").unwrap(); // safed by main() let name = scmd.value_of("set-name").map(String::from).unwrap(); // safed by clap - let sids = rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap(); + let sids = rt.ids::<crate::ui::PathProvider>().map_err_trace_exit_unwrap(); StoreIdIterator::new(Box::new(sids.into_iter().map(Ok))) .into_get_iter(rt.store()) @@ -109,7 +109,7 @@ fn set(rt: &Runtime) { } fn get(rt: &Runtime) { - let sids = rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap(); + let sids = rt.ids::<crate::ui::PathProvider>().map_err_trace_exit_unwrap(); let out = rt.stdout(); let mut outlock = out.lock(); diff --git a/bin/core/imag-edit/src/main.rs b/bin/core/imag-edit/src/main.rs index c0a97dd5..9f8263bb 100644 --- a/bin/core/imag-edit/src/main.rs +++ b/bin/core/imag-edit/src/main.rs @@ -63,7 +63,7 @@ fn main() { let edit_header = rt.cli().is_present("edit-header"); let edit_header_only = rt.cli().is_present("edit-header-only"); - let sids = rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap(); + let sids = rt.ids::<crate::ui::PathProvider>().map_err_trace_exit_unwrap(); StoreIdIterator::new(Box::new(sids.into_iter().map(Ok))) .into_get_iter(rt.store()) diff --git a/bin/core/imag-gps/src/main.rs b/bin/core/imag-gps/src/main.rs index 6ca785d4..0b34605f 100644 --- a/bin/core/imag-gps/src/main.rs +++ b/bin/core/imag-gps/src/main.rs @@ -124,7 +124,7 @@ fn add(rt: &Runtime) { Coordinates::new(long, lati) }; - rt.ids::<::ui::PathProvider>() + rt.ids::<crate::ui::PathProvider>() .map_err_trace_exit_unwrap() .into_iter() .for_each(|id| { @@ -149,7 +149,7 @@ fn remove(rt: &Runtime) { .unwrap() .is_present("print-removed"); // safed by main() - rt.ids::<::ui::PathProvider>() + rt.ids::<crate::ui::PathProvider>() .map_err_trace_exit_unwrap() .into_iter() .for_each(|id| { @@ -179,7 +179,7 @@ fn remove(rt: &Runtime) { fn get(rt: &Runtime) { let mut stdout = rt.stdout(); - rt.ids::<::ui::PathProvider>() + rt.ids::<crate::ui::PathProvider>() .map_err_trace_exit_unwrap() .into_iter() .for_each(|id| { diff --git a/bin/core/imag-header/src/main.rs b/bin/core/imag-header/src/main.rs index 1ee8440c..3e7b01da 100644 --- a/bin/core/imag-header/src/main.rs +++ b/bin/core/imag-header/src/main.rs @@ -79,7 +79,7 @@ fn main() { trace!("list_output_with_ids = {:?}", list_output_with_ids ); trace!("list_output_with_ids_fmt = {:?}", list_output_with_ids_fmt); - let sids = rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap(); + let sids = rt.ids::<crate::ui::PathProvider>().map_err_trace_exit_unwrap(); let iter = StoreIdIterator::new(Box::new(sids.into_iter().map(Ok))) .into_get_iter(rt.store()) diff --git a/bin/core/imag-ids/src/main.rs b/bin/core/imag-ids/src/main.rs index b0b84199..dbe271b2 100644 --- a/bin/core/imag-ids/src/main.rs +++ b/bin/core/imag-ids/src/main.rs @@ -65,8 +65,8 @@ use libimagerror::io::ToExitCode; mod id_filters; mod ui; -use ui::build_ui; -use id_filters::IsInCollectionsFilter; +use crate::ui::build_ui; +use crate::id_filters::IsInCollectionsFilter; fn main() { let version = make_imag_version!(); @@ -93,7 +93,7 @@ fn main() { let iterator = if rt.ids_from_stdin() { debug!("Fetching IDs from stdin..."); - let ids = rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap(); + let ids = rt.ids::<crate::ui::PathProvider>().map_err_trace_exit_unwrap(); Box::new(ids.into_iter().map(Ok)) as Box<Iterator<Item = Result<StoreId, _>>> } else { diff --git a/bin/core/imag-link/src/main.rs b/bin/core/imag-link/src/main.rs index fedda184..0255f341 100644 --- a/bin/core/imag-link/src/main.rs +++ b/bin/core/imag-link/src/main.rs @@ -79,7 +79,7 @@ use failure::Fallible as Result; mod ui; -use ui::build_ui; +use crate::ui::build_ui; fn main() { let version = make_imag_version!(); @@ -209,7 +209,7 @@ fn remove_linking(rt: &Runtime) { }) .unwrap(); - rt.ids::<::ui::PathProvider>() + rt.ids::<crate::ui::PathProvider>() .map_err_trace_exit_unwrap() .into_iter() .for_each(|id| match rt.store().get(id.clone()) { @@ -245,7 +245,7 @@ fn remove_linking(rt: &Runtime) { } fn unlink(rt: &Runtime) { - rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap().into_iter().for_each(|id| { + rt.ids::<crate::ui::PathProvider>().map_err_trace_exit_unwrap().into_iter().for_each(|id| { rt.store() .get(id.clone()) .map_err_trace_exit_unwrap() @@ -271,7 +271,7 @@ fn list_linkings(rt: &Runtime) { let mut tab = ::prettytable::Table::new(); tab.set_titles(row!["#", "Link"]); - rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap().into_iter().for_each(|id| { + rt.ids::<crate::ui::PathProvider>().map_err_trace_exit_unwrap().into_iter().for_each(|id| { match rt.store().get(id.clone()) { Ok(Some(entry)) => { for (i, link) in entry.get_internal_links().map_err_trace_exit_unwrap().enumerate() { diff --git a/bin/core/imag-mv/src/main.rs b/bin/core/imag-mv/src/main.rs index f5d4d341..9f2fde74 100644 --- a/bin/core/imag-mv/src/main.rs +++ b/bin/core/imag-mv/src/main.rs @@ -45,7 +45,7 @@ extern crate libimagentrylink; use std::process::exit; mod ui; -use ui::build_ui; +use crate::ui::build_ui; use std::path::PathBuf; diff --git a/bin/core/imag-ref/src/main.rs b/bin/core/imag-ref/src/main.rs index bd9f6ed6..197a530a 100644 --- a/bin/core/imag-ref/src/main.rs +++ b/bin/core/imag-ref/src/main.rs @@ -46,7 +46,7 @@ extern crate libimaginteraction; extern crate libimagutil; mod ui; -use ui::build_ui; +use crate::ui::build_ui; use std::process::exit; use std::io::Write; @@ -92,7 +92,7 @@ fn main() { fn deref(rt: &Runtime) { let cmd = rt.cli().subcommand_matches("deref").unwrap(); let basepath = cmd.value_of("override-basepath"); - let ids = rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap(); + let ids = rt.ids::<crate::ui::PathProvider>().map_err_trace_exit_unwrap(); let cfg = get_ref_config(&rt, "imag-ref").map_err_trace_exit_unwrap(); let out = rt.stdout(); let mut outlock = out.lock(); @@ -130,7 +130,7 @@ fn remove(rt: &Runtime) { let cmd = rt.cli().subcommand_matches("remove").unwrap(); let yes = cmd.is_present("yes"); - let ids = rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap(); + let ids = rt.ids::<crate::ui::PathProvider>().map_err_trace_exit_unwrap(); let mut input = rt.stdin().unwrap_or_else(|| { error!("No input stream. Cannot ask for permission"); @@ -169,7 +169,7 @@ fn list_dead(rt: &Runtime) { let list_id = cmd.is_present("list-dead-ids"); let mut output = rt.stdout(); - rt.ids::<::ui::PathProvider>() + rt.ids::<crate::ui::PathProvider>() .map_err_trace_exit_unwrap() .into_iter() .for_each(|id| { @@ -204,7 +204,7 @@ fn list_dead(rt: &Runtime) { }); } -fn create(rt: &Runtime) { +fn create(_rt: &Runtime) { unimplemented!() } diff --git a/bin/core/imag-store/src/create.rs b/bin/core/imag-store/src/create.rs index 8b6cc2e2..dcb5c686 100644 --- a/bin/core/imag-store/src/create.rs +++ b/bin/core/imag-store/src/create.rs @@ -35,7 +35,7 @@ use libimagerror::trace::MapErrTrace; use libimagerror::exit::ExitUnwrap; use libimagutil::debug_result::*; -use util::build_toml_header; +use crate::util::build_toml_header; pub fn create(rt: &Runtime) { let scmd = rt.cli().subcommand_matches("create").unwrap(); diff --git a/bin/core/imag-store/src/delete.rs b/bin/core/imag-store/src/delete.rs index 50c73d97..c3a9a052 100644 --- a/bin/core/imag-store/src/delete.rs +++ b/bin/core/imag-store/src/delete.rs @@ -39,7 +39,7 @@ pub fn delete(rt: &Runtime) { #[cfg(test)] mod tests { - use create::create; + use crate::create::create; use super::delete; use std::path::PathBuf; diff --git a/bin/core/imag-store/src/get.rs b/bin/core/imag-store/src/get.rs index bf9a1eea..6885f594 100644 --- a/bin/core/imag-store/src/get.rs +++ b/bin/core/imag-store/src/get.rs @@ -24,7 +24,7 @@ use libimagerror::trace::MapErrTrace; use libimagerror::exit::ExitUnwrap; use libimagstore::storeid::StoreId; -use retrieve::print_entry; +use crate::retrieve::print_entry; pub fn get(rt: &Runtime) { let scmd = rt.cli().subcommand_matches("get").unwrap(); diff --git a/bin/core/imag-store/src/main.rs b/bin/core/imag-store/src/main.rs index 7c0c0f10..6ba6ad98 100644 --- a/bin/core/imag-store/src/main.rs +++ b/bin/core/imag-store/src/main.rs @@ -65,13 +65,13 @@ mod util; use std::ops::Deref; -use create::create; -use delete::delete; -use get::get; -use retrieve::retrieve; -use ui::build_ui; -use update::update; -use verify::verify; +use crate::create::create; +use crate::delete::delete; +use crate::get::get; +use crate::retrieve::retrieve; +use crate::ui::build_ui; +use crate::update::update; +use crate::verify::verify; fn main() { let version = make_imag_version!(); diff --git a/bin/core/imag-store/src/update.rs b/bin/core/imag-store/src/update.rs index c2687973..4ce5ac44 100644 --- a/bin/core/imag-store/src/update.rs +++ b/bin/core/imag-store/src/update.rs @@ -25,7 +25,7 @@ use libimagerror::trace::MapErrTrace; use libimagerror::exit::ExitUnwrap; use libimagstore::storeid::StoreId; -use util::build_toml_header; +use crate::util::build_toml_header; pub fn update(rt: &Runtime) { let scmd = rt.cli().subcommand_matches("update").unwrap(); diff --git a/bin/core/imag-tag/src/main.rs b/bin/core/imag-tag/src/main.rs index e3ba7f20..9f1f9bf4 100644 --- a/bin/core/imag-tag/src/main.rs +++ b/bin/core/imag-tag/src/main.rs @@ -75,7 +75,7 @@ use clap::ArgMatches; mod ui; -use ui::build_ui; +use crate::ui::build_ui; fn main() { let version = make_imag_version!(); @@ -84,7 +84,7 @@ fn main() { "Direct interface to the store. Use with great care!", build_ui); - let ids = rt.ids::<::ui::PathProvider>().map_err_trace_exit_unwrap(); + let ids = rt.ids::<crate::ui::PathProvider>().map_err_trace_exit_unwrap(); rt.cli() .subcommand_name() diff --git a/bin/core/imag-view/src/main.rs b/bin/core/imag-view/src/main.rs index 1dca0c79..7ffe61b5 100644 --- a/bin/core/imag-view/src/main.rs +++ b/bin/core/imag-view/src/main.rs @@ -71,7 +71,7 @@ use libimagstore::iter::get::StoreIdGetIteratorExtension; use libimagstore::store::FileLockEntry; mod ui; -use ui::build_ui; +use crate::ui::build_ui; fn main() { let version = make_imag_version!(); @@ -82,7 +82,7 @@ fn main() { let view_header = rt.cli().is_present("view-header"); let hide_content = rt.cli().is_present("not-view-content"); - let entries = rt.ids::<::ui::PathProvider>() + let entries = rt.ids::<crate::ui::PathProvider>() .map_err_trace_exit_unwrap() .into_iter() .map(Ok) diff --git a/bin/domain/imag-bookmark/src/main.rs b/bin/domain/imag-bookmark/src/main.rs index c7b942cb..90a98979 100644 --- a/bin/domain/imag-bookmark/src/main.rs +++ b/bin/domain/imag-bookmark/src/main.rs @@ -63,7 +63,7 @@ use libimagutil::debug_result::DebugResult; mod ui; -use ui::build_ui; +use crate::ui::build_ui; fn main() { let version = make_imag_version!(); diff --git a/bin/domain/imag-contact/src/edit.rs b/bin/domain/imag-contact/src/edit.rs index bcb89900..1c7a2ae6 100644 --- a/bin/domain/imag-contact/src/edit.rs +++ b/bin/domain/imag-contact/src/edit.rs @@ -68,7 +68,7 @@ pub fn edit(rt: &Runtime) { exit(1) }); - ::util::find_contact_by_hash(rt, hash) + crate::util::find_contact_by_hash(rt, hash) .for_each(|contact| { loop { let res = edit_contact(&rt, &contact, &ref_config, collection_name, force_override); diff --git a/bin/domain/imag-contact/src/main.rs b/bin/domain/imag-contact/src/main.rs index 324d41a6..bf472bb6 100644 --- a/bin/domain/imag-contact/src/main.rs +++ b/bin/domain/imag-contact/src/main.rs @@ -82,10 +82,10 @@ mod util; mod create; mod edit; -use ui::build_ui; -use util::build_data_object_for_handlebars; -use create::create; -use edit::edit; +use crate::ui::build_ui; +use crate::util::build_data_object_for_handlebars; +use crate::create::create; +use crate::edit::edit; fn main() { let version = make_imag_version!(); diff --git a/bin/domain/imag-diary/src/create.rs b/bin/domain/imag-diary/src/create.rs index 423a701e..af6d7fe9 100644 --- a/bin/domain/imag-diary/src/create.rs +++ b/bin/domain/imag-diary/src/create.rs @@ -36,9 +36,9 @@ use libimagutil::debug_option::DebugOption; use libimagstore::store::FileLockEntry; use libimagstore::store::Store; -use util::get_diary_name; -use util::get_diary_timed_config; -use util::Timed; +use crate::util::get_diary_name; +use crate::util::get_diary_timed_config; +use crate::util::Timed; pub fn create(rt: &Runtime) { let diaryname = get_diary_name(rt) @@ -61,7 +61,7 @@ pub fn create(rt: &Runtime) { } fn create_entry<'a>(diary: &'a Store, diaryname: &str, rt: &Runtime) -> FileLockEntry<'a> { - use util::parse_timed_string; + use crate::util::parse_timed_string; let create = rt.cli().subcommand_matches("create").unwrap(); diff --git a/bin/domain/imag-diary/src/delete.rs b/bin/domain/imag-diary/src/delete.rs index 12301800..9de65687 100644 --- a/bin/domain/imag-diary/src/delete.rs +++ b/bin/domain/imag-diary/src/delete.rs @@ -30,7 +30,7 @@ use libimagstore::storeid::IntoStoreId; use libimagerror::trace::MapErrTrace; use libimagerror::exit::ExitUnwrap; -use util::get_diary_name; +use crate::util::get_diary_name; pub fn delete(rt: &Runtime) { use libimaginteraction::ask::ask_bool; diff --git a/bin/domain/imag-diary/src/list.rs b/bin/domain/imag-diary/src/list.rs index b551bd11..3d07f6fa 100644 --- a/bin/domain/imag-diary/src/list.rs +++ b/bin/domain/imag-diary/src/list.rs @@ -33,7 +33,7 @@ use libimagstore::storeid::IntoStoreId; use failure::Fallible as Result; -use util::get_diary_name; +use crate::util::get_diary_name; pub fn list(rt: &Runtime) { let diaryname = get_diary_name(rt) diff --git a/bin/domain/imag-diary/src/main.rs b/bin/domain/imag-diary/src/main.rs index 055911c7..cf5c3fd2 100644 --- a/bin/domain/imag-diary/src/main.rs +++ b/bin/domain/imag-diary/src/main.rs @@ -67,10 +67,10 @@ mod ui; mod util; mod view; -use create::create; -use delete::delete; -use list::list; -use view::view; +use crate::create::create; +use crate::delete::delete; +use crate::list::list; +use crate::view::view; fn main() { let version = make_imag_version!(); diff --git a/bin/domain/imag-diary/src/view.rs b/bin/domain/imag-diary/src/view.rs index 9f0acbaa..9acab804 100644 --- a/bin/domain/imag-diary/src/view.rs +++ b/bin/domain/imag-diary/src/view.rs @@ -27,7 +27,7 @@ use libimagutil::warn_exit::warn_exit; use libimagstore::iter::get::StoreIdGetIteratorExtension; use libimagentryview::viewer::Viewer; -use util::get_diary_name; +use crate::util::get_diary_name; pub fn view(rt: &Runtime) { let diaryname = get_diary_name(rt).unwrap_or_else(|| warn_exit("No diary name", 1)); diff --git a/bin/domain/imag-log/src/main.rs b/bin/domain/imag-log/src/main.rs index 6110dd90..3ecd4923 100644 --- a/bin/domain/imag-log/src/main.rs +++ b/bin/domain/imag-log/src/main.rs @@ -71,7 +71,7 @@ use libimagstore::iter::get::StoreIdGetIteratorExtension; use libimagstore::store::FileLockEntry; mod ui; -use ui::build_ui; +use crate::ui::build_ui; use toml::Value; use itertools::Itertools; diff --git a/bin/domain/imag-mail/src/main.rs b/bin/domain/imag-mail/src/main.rs index 8f7418df..bd6cf9a3 100644 --- a/bin/domain/imag-mail/src/main.rs +++ b/bin/domain/imag-mail/src/main.rs @@ -71,7 +71,7 @@ use libimagstore::iter::get::StoreIdGetIteratorExtension; mod ui; -use ui::build_ui; +use crate::ui::build_ui; fn main() { let version = make_imag_version!(); @@ -215,7 +215,7 @@ fn list(rt: &Runtime) { } if rt.ids_from_stdin() { - let iter = rt.ids::<::ui::PathProvider>() + let iter = rt.ids::<crate::ui::PathProvider>() .map_err_trace_exit_unwrap() .into_iter() .map(Ok); diff --git a/bin/domain/imag-notes/src/main.rs b/bin/domain/imag-notes/src/main.rs index 3d7be38d..5c06a4b5 100644 --- a/bin/domain/imag-notes/src/main.rs +++ b/bin/domain/imag-notes/src/main.rs @@ -65,7 +65,7 @@ use libimagutil::warn_result::WarnResult; mod ui; -use ui::build_ui; +use crate::ui::build_ui; fn main() { let version = make_imag_version!(); diff --git a/bin/domain/imag-timetrack/src/main.rs b/bin/domain/imag-timetrack/src/main.rs index af7f1414..2862b6d7 100644 --- a/bin/domain/imag-timetrack/src/main.rs +++ b/bin/domain/imag-timetrack/src/main.rs @@ -62,16 +62,16 @@ mod ui; mod week; mod year; -use cont::cont; -use day::day; -use list::{list, list_impl}; -use month::month; -use start::start; -use stop::stop; -use track::track; -use ui::build_ui; -use week::week; -use year::year; +use crate::cont::cont; +use crate::day::day; +use crate::list::{list, list_impl}; +use crate::month::month; +use crate::start::start; +use crate::stop::stop; +use crate::track::track; +use crate::ui::build_ui; +use crate::week::week; +use crate::year::year; use libimagrt::setup::generate_runtime_setup; use libimagerror::trace::MapErrTrace; diff --git a/bin/domain/imag-todo/src/main.rs b/bin/domain/imag-todo/src/main.rs index d62eabb2..3a2eb55b 100644 --- a/bin/domain/imag-todo/src/main.rs +++ b/bin/domain/imag-todo/src/main.rs @@ -60,7 +60,7 @@ use libimagerror::io::ToExitCode; mod ui; -use ui::build_ui; +use crate::ui::build_ui; fn main() { let version = make_imag_version!(); let rt = generate_runtime_setup("imag-todo", diff --git a/bin/domain/imag-wiki/src/main.rs b/bin/domain/imag-wiki/src/main.rs index 17f08251..1556abbb 100644 --- a/bin/domain/imag-wiki/src/main.rs +++ b/bin/domain/imag-wiki/src/main.rs @@ -44,7 +44,7 @@ use libimagwiki::store::WikiStore; use libimagentryedit::edit::{Edit, EditHeader}; mod ui; -use ui::build_ui; +use crate::ui::build_ui; fn main() { let version = make_imag_version!(); |