Use libimagentryedit instead of libimagrt

imag-diary/Cargo.toml

@@ -15,6 +15,9 @@ path = "../libimagrt"
 [dependencies.libimagdiary]
 path = "../libimagdiary"
 
+[dependencies.libimagentryedit]
+path = "../libimagentryedit"
+
 [dependencies.libimagentrylist]
 path = "../libimagentrylist"
 

imag-diary/src/create.rs

@@ -4,7 +4,7 @@ use libimagdiary::diary::Diary;
 use libimagdiary::diaryid::DiaryId;
 use libimagdiary::error::DiaryError as DE;
 use libimagdiary::error::DiaryErrorKind as DEK;
-use libimagrt::edit::Edit;
+use libimagentryedit::edit::Edit;
 use libimagrt::runtime::Runtime;
 use libimagerror::trace::trace_error;
 use libimagdiary::entry::Entry;

imag-diary/src/edit.rs

@@ -5,7 +5,7 @@ use libimagdiary::diary::Diary;
 use libimagdiary::diaryid::DiaryId;
 use libimagdiary::error::DiaryError as DE;
 use libimagdiary::error::DiaryErrorKind as DEK;
-use libimagrt::edit::Edit;
+use libimagentryedit::edit::Edit;
 use libimagrt::runtime::Runtime;
 use libimagerror::trace::trace_error;
 use libimagtimeui::datetime::DateTime;

imag-diary/src/main.rs

@@ -19,6 +19,7 @@ extern crate clap;
 extern crate chrono;
 
 extern crate libimagdiary;
+extern crate libimagentryedit;
 extern crate libimagentrylist;
 extern crate libimagentryview;
 extern crate libimaginteraction;

imag-notes/Cargo.toml

@@ -15,6 +15,9 @@ path = "../libimagrt"
 [dependencies.libimagnotes]
 path = "../libimagnotes"
 
+[dependencies.libimagentryedit]
+path = "../libimagentryedit"
+
 [dependencies.libimagentrytag]
 path = "../libimagentrytag"
 

imag-notes/src/main.rs

@@ -5,12 +5,13 @@ extern crate semver;
 
 extern crate libimagnotes;
 extern crate libimagrt;
+extern crate libimagentryedit;
 extern crate libimagentrytag;
 extern crate libimagerror;
 
 use std::process::exit;
 
-use libimagrt::edit::Edit;
+use libimagentryedit::edit::Edit;
 use libimagrt::runtime::Runtime;
 use libimagrt::setup::generate_runtime_setup;
 use libimagnotes::note::Note;

libimagdiary/Cargo.toml

@@ -24,3 +24,6 @@ path = "../libimagutil"
 [dependencies.libimagrt]
 path = "../libimagrt"
 
+[dependencies.libimagentryedit]
+path = "../libimagentryedit"
+

libimagdiary/src/entry.rs

@@ -2,8 +2,8 @@ use std::ops::Deref;
 use std::ops::DerefMut;
 
 use libimagstore::store::FileLockEntry;
-use libimagrt::edit::Edit;
+use libimagentryedit::edit::Edit;
-use libimagrt::edit::EditResult;
+use libimagentryedit::result::Result as EditResult;
 use libimagrt::runtime::Runtime;
 
 use diaryid::DiaryId;

libimagdiary/src/lib.rs

@@ -25,6 +25,7 @@ extern crate itertools;
 #[macro_use] extern crate libimagstore;
 #[macro_use] extern crate libimagutil;
 #[macro_use] extern crate libimagerror;
+extern crate libimagentryedit;
 extern crate libimagrt;
 
 module_entry_path_mod!("diary", "0.2.0");

libimagentryview/Cargo.toml

@@ -17,3 +17,6 @@ path = "../libimagstore"
 [dependencies.libimagerror]
 path = "../libimagerror"
 
+[dependencies.libimagentryedit]
+path = "../libimagentryedit"
+

libimagentryview/src/builtin/editor.rs

@@ -1,6 +1,6 @@
 use libimagstore::store::Entry;
 use libimagrt::runtime::Runtime;
-use libimagrt::edit::edit_in_tmpfile;
+use libimagentryedit::edit::edit_in_tmpfile;
 
 use viewer::Viewer;
 use result::Result;

libimagentryview/src/lib.rs

@@ -21,6 +21,7 @@ extern crate toml;
 extern crate libimagstore;
 extern crate libimagrt;
 #[macro_use] extern crate libimagerror;
+extern crate libimagentryedit;
 
 pub mod error;
 pub mod builtin;

libimagnotes/Cargo.toml

@@ -17,6 +17,9 @@ path = "../libimagerror"
 [dependencies.libimagrt]
 path = "../libimagrt"
 
+[dependencies.libimagentryedit]
+path = "../libimagentryedit"
+
 [dependencies.libimagentrytag]
 path = "../libimagentrytag"
 

libimagnotes/src/lib.rs

@@ -21,6 +21,7 @@ extern crate toml;
 extern crate libimagrt;
 #[macro_use] extern crate libimagstore;
 #[macro_use] extern crate libimagerror;
+extern crate libimagentryedit;
 extern crate libimagentrytag;
 
 module_entry_path_mod!("notes", "0.2.0");

libimagnotes/src/note.rs

@@ -4,7 +4,8 @@ use std::ops::Deref;
 use toml::Value;
 
 use libimagrt::runtime::Runtime;
-use libimagrt::edit::{Edit, EditResult};
+use libimagentryedit::edit::Edit;
+use libimagentryedit::result::Result as EditResult;
 use libimagstore::storeid::IntoStoreId;
 use libimagstore::storeid::StoreId;
 use libimagstore::storeid::StoreIdIterator;