summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2016-08-09 13:52:41 +0200
committerMatthias Beyer <mail@beyermatthias.de>2016-08-09 15:47:56 +0200
commit4614b9d43075cf3e88760c68b13c2c0124aa8ca3 (patch)
tree7aa13fbd7023541b21ba6391ea06b0c74e20d19e
parent676146df3a5ecfe5070989492513b136c98fed1c (diff)
downloadimag-4614b9d43075cf3e88760c68b13c2c0124aa8ca3.zip
imag-4614b9d43075cf3e88760c68b13c2c0124aa8ca3.tar.gz
Use libimagentryedit instead of libimagrt
-rw-r--r--imag-diary/Cargo.toml3
-rw-r--r--imag-diary/src/create.rs2
-rw-r--r--imag-diary/src/edit.rs2
-rw-r--r--imag-diary/src/main.rs1
-rw-r--r--imag-notes/Cargo.toml3
-rw-r--r--imag-notes/src/main.rs3
-rw-r--r--libimagdiary/Cargo.toml3
-rw-r--r--libimagdiary/src/entry.rs4
-rw-r--r--libimagdiary/src/lib.rs1
-rw-r--r--libimagentryview/Cargo.toml3
-rw-r--r--libimagentryview/src/builtin/editor.rs2
-rw-r--r--libimagentryview/src/lib.rs1
-rw-r--r--libimagnotes/Cargo.toml3
-rw-r--r--libimagnotes/src/lib.rs1
-rw-r--r--libimagnotes/src/note.rs3
15 files changed, 28 insertions, 7 deletions
diff --git a/imag-diary/Cargo.toml b/imag-diary/Cargo.toml
index 1665dfc..2d0df64 100644
--- a/imag-diary/Cargo.toml
+++ b/imag-diary/Cargo.toml
@@ -15,6 +15,9 @@ path = "../libimagrt"
[dependencies.libimagdiary]
path = "../libimagdiary"
+[dependencies.libimagentryedit]
+path = "../libimagentryedit"
+
[dependencies.libimagentrylist]
path = "../libimagentrylist"
diff --git a/imag-diary/src/create.rs b/imag-diary/src/create.rs
index 5777ef6..d4b5edb 100644
--- a/imag-diary/src/create.rs
+++ b/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;
diff --git a/imag-diary/src/edit.rs b/imag-diary/src/edit.rs
index 6b68485..cc3362f 100644
--- a/imag-diary/src/edit.rs
+++ b/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;
diff --git a/imag-diary/src/main.rs b/imag-diary/src/main.rs
index c65780a..7a34f1e 100644
--- a/imag-diary/src/main.rs
+++ b/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;
diff --git a/imag-notes/Cargo.toml b/imag-notes/Cargo.toml
index 8ca0347..9eff371 100644
--- a/imag-notes/Cargo.toml
+++ b/imag-notes/Cargo.toml
@@ -15,6 +15,9 @@ path = "../libimagrt"
[dependencies.libimagnotes]
path = "../libimagnotes"
+[dependencies.libimagentryedit]
+path = "../libimagentryedit"
+
[dependencies.libimagentrytag]
path = "../libimagentrytag"
diff --git a/imag-notes/src/main.rs b/imag-notes/src/main.rs
index c14b2de..3e478ca 100644
--- a/imag-notes/src/main.rs
+++ b/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;
diff --git a/libimagdiary/Cargo.toml b/libimagdiary/Cargo.toml
index eac1a29..5ac1b26 100644
--- a/libimagdiary/Cargo.toml
+++ b/libimagdiary/Cargo.toml
@@ -24,3 +24,6 @@ path = "../libimagutil"
[dependencies.libimagrt]
path = "../libimagrt"
+[dependencies.libimagentryedit]
+path = "../libimagentryedit"
+
diff --git a/libimagdiary/src/entry.rs b/libimagdiary/src/entry.rs
index d5bddf9..c042fd9 100644
--- a/libimagdiary/src/entry.rs
+++ b/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 libimagrt::edit::EditResult;
+use libimagentryedit::edit::Edit;
+use libimagentryedit::result::Result as EditResult;
use libimagrt::runtime::Runtime;
use diaryid::DiaryId;
diff --git a/libimagdiary/src/lib.rs b/libimagdiary/src/lib.rs
index 231ca0e..1e68ee2 100644
--- a/libimagdiary/src/lib.rs
+++ b/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");
diff --git a/libimagentryview/Cargo.toml b/libimagentryview/Cargo.toml
index ca3cec1..693119b 100644
--- a/libimagentryview/Cargo.toml
+++ b/libimagentryview/Cargo.toml
@@ -17,3 +17,6 @@ path = "../libimagstore"
[dependencies.libimagerror]
path = "../libimagerror"
+[dependencies.libimagentryedit]
+path = "../libimagentryedit"
+
diff --git a/libimagentryview/src/builtin/editor.rs b/libimagentryview/src/builtin/editor.rs
index 0f35c98..d13c1fb 100644
--- a/libimagentryview/src/builtin/editor.rs
+++ b/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;
diff --git a/libimagentryview/src/lib.rs b/libimagentryview/src/lib.rs
index 159e0fa..534b05f 100644
--- a/libimagentryview/src/lib.rs
+++ b/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;
diff --git a/libimagnotes/Cargo.toml b/libimagnotes/Cargo.toml
index 94fabbe..b5a5015 100644
--- a/libimagnotes/Cargo.toml
+++ b/libimagnotes/Cargo.toml
@@ -17,6 +17,9 @@ path = "../libimagerror"
[dependencies.libimagrt]
path = "../libimagrt"
+[dependencies.libimagentryedit]
+path = "../libimagentryedit"
+
[dependencies.libimagentrytag]
path = "../libimagentrytag"
diff --git a/libimagnotes/src/lib.rs b/libimagnotes/src/lib.rs
index 577bd2c..a275848 100644
--- a/libimagnotes/src/lib.rs
+++ b/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");
diff --git a/libimagnotes/src/note.rs b/libimagnotes/src/note.rs
index fc0a507..48f25bf 100644
--- a/libimagnotes/src/note.rs
+++ b/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;