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/domain | |
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/domain')
-rw-r--r-- | bin/domain/imag-bookmark/src/main.rs | 2 | ||||
-rw-r--r-- | bin/domain/imag-contact/src/edit.rs | 2 | ||||
-rw-r--r-- | bin/domain/imag-contact/src/main.rs | 8 | ||||
-rw-r--r-- | bin/domain/imag-diary/src/create.rs | 8 | ||||
-rw-r--r-- | bin/domain/imag-diary/src/delete.rs | 2 | ||||
-rw-r--r-- | bin/domain/imag-diary/src/list.rs | 2 | ||||
-rw-r--r-- | bin/domain/imag-diary/src/main.rs | 8 | ||||
-rw-r--r-- | bin/domain/imag-diary/src/view.rs | 2 | ||||
-rw-r--r-- | bin/domain/imag-log/src/main.rs | 2 | ||||
-rw-r--r-- | bin/domain/imag-mail/src/main.rs | 4 | ||||
-rw-r--r-- | bin/domain/imag-notes/src/main.rs | 2 | ||||
-rw-r--r-- | bin/domain/imag-timetrack/src/main.rs | 20 | ||||
-rw-r--r-- | bin/domain/imag-todo/src/main.rs | 2 | ||||
-rw-r--r-- | bin/domain/imag-wiki/src/main.rs | 2 |
14 files changed, 33 insertions, 33 deletions
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!(); |