matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

Merge pull request #1032 from matthiasbeyer/libimagstore/remove-unused 

Remove unused imports, etc
This commit is contained in:
Matthias Beyer 2017-08-31 12:51:29 +02:00 committed by GitHub
parent c987130cc1 9094c22abf
commit 24bcc53087
73 changed files with 51 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/core/imag-link/Cargo.toml
View File

@ -14,13 +14,12 @@ repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
[dependencies]
semver = "0.5.1"
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
toml = "^0.4"
toml-query = "0.1"
url = "1.2"
toml = "0.4"
toml-query = "0.3.0"
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }

16
bin/core/imag-link/src/main.rs
View File

@ -34,21 +34,23 @@
#[macro_use] extern crate log;
extern crate clap;
extern crate semver;
extern crate toml;
extern crate toml_query;
extern crate url;
#[macro_use] extern crate version;
#[cfg(test)] extern crate toml;
#[cfg(test)] extern crate toml_query;
extern crate libimagentrylink;
extern crate libimagrt;
extern crate libimagstore;
extern crate libimagerror;
#[allow(unused_imports)]
#[cfg(test)]
#[macro_use]
extern crate libimagutil;
#[cfg(not(test))]
extern crate libimagutil;
use std::ops::Deref;
use libimagrt::runtime::Runtime;
@ -374,7 +376,11 @@ mod tests {
}
fn get_entry_links<'a>(entry: &'a FileLockEntry<'a>) -> TomlQueryResult<&'a Value> {
entry.get_header().read(&"imag.links".to_owned())
match entry.get_header().read(&"imag.links".to_owned()) {
Err(e) => Err(e),
Ok(Some(v)) => Ok(v),
Ok(None) => panic!("Didn't find 'imag.links' in {:?}", entry),
}
}
fn links_toml_value<'a, I: IntoIterator<Item = &'static str>>(links: I) -> Value {

2
bin/core/imag-ref/Cargo.toml
View File

@ -14,12 +14,10 @@ repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
[dependencies]
semver = "0.5.1"
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
libimagentryref = { version = "0.4.0", path = "../../../lib/entry/libimagentryref" }

2
bin/core/imag-ref/src/main.rs
View File

@ -34,10 +34,8 @@
#[macro_use] extern crate log;
#[macro_use] extern crate version;
extern crate semver;
extern crate clap;
extern crate libimagstore;
extern crate libimagrt;
extern crate libimagentryref;
extern crate libimagerror;

1
bin/core/imag-store/Cargo.toml
View File

@ -17,7 +17,6 @@ homepage = "http://imag-pim.org"
clap = ">=2.17"
log = "0.3"
version = "2.0.1"
semver = "0.5"
toml = "^0.4"
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore", features = ["verify"] }

4
bin/core/imag-store/src/create.rs
View File

@ -147,12 +147,12 @@ fn create_with_content_and_header(rt: &Runtime,
.map_dbg_err(|e| format!("Error in Store::create(): {:?}", e))
.map(|mut element| {
{
let mut e_content = element.get_content_mut();
let e_content = element.get_content_mut();
*e_content = content;
debug!("New content set");
}
{
let mut e_header = element.get_header_mut();
let e_header = element.get_header_mut();
*e_header = header;
debug!("New header set");
}

1
bin/core/imag-store/src/main.rs
View File

@ -34,7 +34,6 @@
extern crate clap;
#[macro_use] extern crate log;
extern crate semver;
extern crate toml;
#[macro_use] extern crate version;

2
bin/core/imag-store/src/update.rs
View File

@ -41,7 +41,7 @@ pub fn update(rt: &Runtime) {
rt.store()
.retrieve(path)
.map(|mut locked_e| {
let mut e = locked_e.deref_mut();
let e = locked_e.deref_mut();
scmd.value_of("content")
.map(|new_content| {

3
bin/core/imag-tag/Cargo.toml
View File

@ -17,8 +17,7 @@ homepage = "http://imag-pim.org"
clap = "2.*"
log = "0.3"
version = "2.0.1"
semver = "0.2"
toml = "^0.4"
toml = "0.4"
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }

8
bin/core/imag-tag/src/main.rs
View File

@ -19,18 +19,22 @@
extern crate clap;
#[macro_use] extern crate log;
extern crate semver;
extern crate toml;
#[macro_use] extern crate version;
#[cfg(test)] extern crate toml;
extern crate libimagstore;
extern crate libimagrt;
extern crate libimagentrytag;
extern crate libimagerror;
#[cfg(test)]
#[macro_use]
extern crate libimagutil;
#[cfg(not(test))]
extern crate libimagutil;
#[cfg(test)]
extern crate toml_query;

2
bin/core/imag-view/Cargo.toml
View File

@ -16,8 +16,6 @@ homepage = "http://imag-pim.org"
[dependencies]
clap = ">=2.17"
log = "0.3"
semver = "0.5"
toml = "^0.4"
version = "2.0.1"
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }

2
bin/core/imag-view/src/main.rs
View File

@ -34,8 +34,6 @@
extern crate clap;
#[macro_use] extern crate log;
extern crate semver;
extern crate toml;
#[macro_use] extern crate version;
extern crate libimagentryview;

1
bin/domain/imag-bookmark/Cargo.toml
View File

@ -21,6 +21,5 @@ version = "2.0.1"
libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
libimagbookmark = { version = "0.4.0", path = "../../../lib/domain/libimagbookmark" }
libimagentrylink = { version = "0.4.0", path = "../../../lib/entry/libimagentrylink" }
libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" }
libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }

1
bin/domain/imag-bookmark/src/main.rs
View File

@ -37,7 +37,6 @@ extern crate clap;
#[macro_use] extern crate version;
extern crate libimagbookmark;
extern crate libimagentrylink;
extern crate libimagentrytag;
extern crate libimagrt;
extern crate libimagerror;

3
bin/domain/imag-mail/Cargo.toml
View File

@ -10,12 +10,9 @@ readme = "../README.md"
license = "LGPL-2.1"
[dependencies]
semver = "0.5"
clap = "2.*"
log = "0.3"
version = "2.0.1"
toml = "0.4.*"
url = "1.2"
libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }

13
bin/domain/imag-mail/src/main.rs
View File

@ -17,10 +17,7 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
extern crate semver;
extern crate clap;
extern crate toml;
extern crate url;
#[macro_use] extern crate log;
#[macro_use] extern crate version;
@ -35,7 +32,6 @@ use libimagmail::mail::Mail;
use libimagentryref::reference::Ref;
use libimagrt::runtime::Runtime;
use libimagrt::setup::generate_runtime_setup;
use libimagutil::debug_result::*;
use libimagutil::info_result::*;
mod ui;
@ -65,7 +61,7 @@ fn import_mail(rt: &Runtime) {
let scmd = rt.cli().subcommand_matches("import-mail").unwrap();
let path = scmd.value_of("path").unwrap(); // enforced by clap
Mail::import_from_path(rt.store(), path)
let _ = Mail::import_from_path(rt.store(), path)
.map_err_trace()
.map_info_str("Ok");
}
@ -74,11 +70,6 @@ fn list(rt: &Runtime) {
use libimagmail::error::MailErrorKind as MEK;
use libimagmail::error::MapErrInto;
let scmd = rt.cli().subcommand_matches("list").unwrap();
let do_check_dead = scmd.is_present("check-dead");
let do_check_changed = scmd.is_present("check-changed");
let do_check_changed_content = scmd.is_present("check-changed-content");
let do_check_changed_permiss = scmd.is_present("check-changed-permissions");
let store = rt.store();
let iter = match store.retrieve_for_module("ref") {
@ -144,7 +135,7 @@ fn list(rt: &Runtime) {
}
fn mail_store(rt: &Runtime) {
let scmd = rt.cli().subcommand_matches("mail-store").unwrap();
let _ = rt.cli().subcommand_matches("mail-store").unwrap();
error!("This feature is currently not implemented.");
unimplemented!()
}

2
bin/domain/imag-mail/src/ui.rs
View File

@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
use clap::{Arg, ArgGroup, App, SubCommand};
use clap::{Arg, App, SubCommand};
pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
app

1
bin/domain/imag-notes/Cargo.toml
View File

@ -14,7 +14,6 @@ repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
[dependencies]
semver = "0.2.1"
clap = ">=2.17"
log = "0.3"
version = "2.0.1"

1
bin/domain/imag-notes/src/main.rs
View File

@ -19,7 +19,6 @@
extern crate clap;
#[macro_use] extern crate log;
extern crate semver;
#[macro_use] extern crate version;
extern crate itertools;

3
bin/domain/imag-timetrack/Cargo.toml
View File

@ -17,8 +17,6 @@ homepage = "http://imag-pim.org"
clap = "2.*"
log = "0.3"
version = "2.0.1"
semver = "0.2"
toml = "^0.4"
chrono = "^0.4"
filters = "0.1.1"
itertools = "0.6"
@ -27,4 +25,3 @@ libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore"
libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
libimagtimetrack = { version = "0.4.0", path = "../../../lib/domain/libimagtimetrack" }
libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }

3
bin/domain/imag-timetrack/src/cont.rs
View File

@ -18,12 +18,9 @@
//
use std::cmp::Ord;
use std::cmp::Ordering;
use filters::ops::not::Not;
use filters::filter::Filter;
use itertools::Itertools;
use itertools::MinMaxResult;
use chrono::NaiveDateTime;
use libimagerror::trace::trace_error;

5
bin/domain/imag-timetrack/src/day.rs
View File

@ -17,14 +17,9 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
use std::cmp::Ord;
use std::cmp::Ordering;
use std::str::FromStr;
use filters::ops::not::Not;
use filters::filter::Filter;
use itertools::Itertools;
use itertools::MinMaxResult;
use chrono::NaiveDateTime;
use libimagerror::trace::trace_error;

9
bin/domain/imag-timetrack/src/list.rs
View File

@ -17,15 +17,9 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
use std::cmp::Ord;
use std::cmp::Ordering;
use std::str::FromStr;
use filters::ops::not::Not;
use filters::filter::Filter;
use itertools::Itertools;
use itertools::MinMaxResult;
use chrono::NaiveDateTime;
use libimagerror::trace::trace_error;
use libimagerror::trace::MapErrTrace;
@ -33,7 +27,6 @@ use libimagerror::iter::TraceIterator;
use libimagstore::store::FileLockEntry;
use libimagtimetrack::timetrackingstore::TimeTrackStore;
use libimagtimetrack::timetracking::TimeTracking;
use libimagtimetrack::iter::filter::*;
use libimagrt::runtime::Runtime;
@ -76,7 +69,7 @@ pub fn list(rt: &Runtime) -> i32 {
};
let end_time_filter = |timetracking: &FileLockEntry| {
start.map(|s| match timetracking.get_end_datetime() {
end.map(|s| match timetracking.get_end_datetime() {
Ok(Some(dt)) => dt <= s,
Ok(None) => list_not_ended,
Err(e) => {

3
bin/domain/imag-timetrack/src/main.rs
View File

@ -24,8 +24,6 @@ extern crate log;
extern crate version;
extern crate clap;
extern crate semver;
extern crate toml;
extern crate chrono;
extern crate filters;
extern crate itertools;
@ -34,7 +32,6 @@ extern crate libimagerror;
extern crate libimagstore;
extern crate libimagrt;
extern crate libimagtimetrack;
extern crate libimagutil;
mod cont;
mod day;

6
bin/domain/imag-timetrack/src/month.rs
View File

@ -17,14 +17,9 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
use std::cmp::Ord;
use std::cmp::Ordering;
use std::str::FromStr;
use filters::ops::not::Not;
use filters::filter::Filter;
use itertools::Itertools;
use itertools::MinMaxResult;
use chrono::NaiveDateTime;
use libimagerror::trace::trace_error;
@ -44,7 +39,6 @@ pub fn month(rt: &Runtime) -> i32 {
let filter = {
use chrono::offset::Local;
use chrono::naive::NaiveDate;
use chrono::Weekday;
use chrono::Datelike;
let now = Local::now();

1
bin/domain/imag-timetrack/src/stop.rs
View File

@ -24,7 +24,6 @@ use filters::filter::Filter;
use libimagerror::trace::trace_error;
use libimagerror::iter::TraceIterator;
use libimagrt::runtime::Runtime;
use libimagrt::setup::generate_runtime_setup;
use libimagtimetrack::timetracking::TimeTracking;
use libimagtimetrack::tag::TimeTrackingTag;

5
bin/domain/imag-timetrack/src/week.rs
View File

@ -17,14 +17,9 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
use std::cmp::Ord;
use std::cmp::Ordering;
use std::str::FromStr;
use filters::ops::not::Not;
use filters::filter::Filter;
use itertools::Itertools;
use itertools::MinMaxResult;
use chrono::NaiveDateTime;
use libimagerror::trace::trace_error;

6
bin/domain/imag-timetrack/src/year.rs
View File

@ -17,14 +17,9 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
use std::cmp::Ord;
use std::cmp::Ordering;
use std::str::FromStr;
use filters::ops::not::Not;
use filters::filter::Filter;
use itertools::Itertools;
use itertools::MinMaxResult;
use chrono::NaiveDateTime;
use libimagerror::trace::trace_error;
@ -44,7 +39,6 @@ pub fn year(rt: &Runtime) -> i32 {
let filter = {
use chrono::offset::Local;
use chrono::naive::NaiveDate;
use chrono::Weekday;
use chrono::Datelike;
let now = Local::now();

5
bin/domain/imag-todo/Cargo.toml
View File

@ -15,17 +15,12 @@ homepage = "http://imag-pim.org"
[dependencies]
clap = ">=2.17"
glob = "0.2.11"
log = "0.3.6"
semver = "0.5.1"
serde_json = "0.8.3"
task-hookrs = "0.2.2"
toml = "0.4.*"
toml-query = "0.3.*"
is-match = "0.1.*"
version = "2.0.1"
libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
libimagtodo = { version = "0.4.0", path = "../../../lib/domain/libimagtodo" }

6
bin/domain/imag-todo/src/main.rs
View File

@ -18,19 +18,13 @@
//
extern crate clap;
extern crate glob;
#[macro_use] extern crate log;
extern crate serde_json;
extern crate semver;
extern crate toml;
extern crate toml_query;
#[macro_use] extern crate is_match;
#[macro_use] extern crate version;
extern crate task_hookrs;
extern crate libimagrt;
extern crate libimagstore;
extern crate libimagerror;
extern crate libimagtodo;

2
lib/core/libimagerror/src/error_gen.rs
View File

@ -252,7 +252,7 @@ mod test {
}
impl Display for CustomData {
fn fmt(&self, fmt: &mut Formatter) -> Result<(), FmtError> {
fn fmt(&self, _: &mut Formatter) -> Result<(), FmtError> {
Ok(())
}
}

1
lib/core/libimagrt/Cargo.toml
View File

@ -20,7 +20,6 @@ toml = "^0.4"
log = "0.3"
xdg-basedir = "1.0"
itertools = "0.5"
tempfile = "2.1"
ansi_term = "0.9"
is-match = "0.1"
toml-query = "0.3.0"

1
lib/core/libimagrt/src/lib.rs
View File

@ -37,7 +37,6 @@
extern crate itertools;
#[cfg(unix)] extern crate xdg_basedir;
extern crate env_logger;
extern crate tempfile;
extern crate ansi_term;
extern crate clap;

3
lib/core/libimagstore/Cargo.toml
View File

@ -14,7 +14,6 @@ repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
[dependencies]
fs2 = "0.4"
glob = "0.2.11"
lazy_static = "0.2.*"
log = "0.3"
@ -22,9 +21,7 @@ regex = "0.2"
semver = "0.5"
toml = "^0.4"
version = "2.0.1"
crossbeam = "0.2.*"
walkdir = "1.0.*"
itertools = "0.6.*"
is-match = "0.1"
serde = "1.0"
serde_json = "1.0"

8
lib/core/libimagstore/src/file_abstraction/inmemory.rs
View File

@ -80,7 +80,7 @@ impl FileAbstractionInstance for InMemoryFileAbstractionInstance {
match *self {
InMemoryFileAbstractionInstance { ref absent_path, .. } => {
let mut mtx = self.fs_abstraction.lock().expect("Locking Mutex failed");
let mut backend = mtx.get_mut();
let backend = mtx.get_mut();
let _ = backend.insert(absent_path.clone(), buf.clone());
return Ok(());
},
@ -130,7 +130,7 @@ impl FileAbstraction for InMemoryFileAbstraction {
fn copy(&self, from: &PathBuf, to: &PathBuf) -> Result<(), SE> {
debug!("Copying : {:?} -> {:?}", from, to);
let mut mtx = self.backend().lock().expect("Locking Mutex failed");
let mut backend = mtx.get_mut();
let backend = mtx.get_mut();
let a = try!(backend.get(from).cloned().ok_or(SEK::FileNotFound.into_error()));
backend.insert(to.clone(), a);
@ -141,7 +141,7 @@ impl FileAbstraction for InMemoryFileAbstraction {
fn rename(&self, from: &PathBuf, to: &PathBuf) -> Result<(), SE> {
debug!("Renaming: {:?} -> {:?}", from, to);
let mut mtx = self.backend().lock().expect("Locking Mutex failed");
let mut backend = mtx.get_mut();
let backend = mtx.get_mut();
let a = try!(backend.get(from).cloned().ok_or(SEK::FileNotFound.into_error()));
backend.insert(to.clone(), a);
@ -164,7 +164,7 @@ impl FileAbstraction for InMemoryFileAbstraction {
fn fill<'a>(&'a mut self, mut d: Drain) -> Result<(), SE> {
debug!("Draining into : {:?}", self);
let mut mtx = try!(self.backend().lock().map_err(|_| SEK::LockError.into_error()));
let mut backend = mtx.get_mut();
let backend = mtx.get_mut();
for (path, element) in d.iter() {
debug!("Drain into {:?}: {:?}", self, path);

2
lib/core/libimagstore/src/file_abstraction/stdio/out.rs
View File

@ -143,7 +143,7 @@ impl<W: Write, M: Mapper> FileAbstraction for StdoutFileAbstraction<W, M> {
fn fill(&mut self, mut d: Drain) -> Result<(), SE> {
debug!("Draining into : {:?}", self);
let mut mtx = try!(self.backend().lock().map_err(|_| SEK::IoError.into_error()));
let mut backend = mtx.get_mut();
let backend = mtx.get_mut();
for (path, element) in d.iter() {
debug!("Drain into {:?}: {:?}", self, path);

4
lib/core/libimagstore/src/lib.rs
View File

@ -35,18 +35,14 @@
#[macro_use] extern crate log;
#[macro_use] extern crate version;
extern crate fs2;
extern crate glob;
#[macro_use] extern crate lazy_static;
extern crate regex;
extern crate toml;
#[cfg(test)] extern crate tempdir;
extern crate semver;
extern crate crossbeam;
extern crate walkdir;
extern crate itertools;
#[macro_use] extern crate is_match;
extern crate serde;
extern crate serde_json;
#[macro_use] extern crate serde_derive;

4
lib/core/libimagstore/src/store.rs
View File

@ -452,7 +452,7 @@ impl Store {
.map_err(|_| SE::new(SEK::LockPoisoned, None))
.and_then(|mut es| {
let new_se = try!(StoreEntry::new(id.clone(), &self.backend));
let mut se = es.entry(id.clone()).or_insert(new_se);
let se = es.entry(id.clone()).or_insert(new_se);
let entry = se.get_entry();
se.status = StoreEntryStatus::Borrowed;
entry
@ -564,7 +564,7 @@ impl Store {
Ok(e) => e,
};
let mut se = try!(hsmap.get_mut(&entry.location).ok_or(SE::new(SEK::IdNotFound, None)));
let se = try!(hsmap.get_mut(&entry.location).ok_or(SE::new(SEK::IdNotFound, None)));
assert!(se.is_borrowed(), "Tried to update a non borrowed entry.");

1
lib/domain/libimagbookmark/Cargo.toml
View File

@ -14,7 +14,6 @@ repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
[dependencies]
semver = "0.5"
url = "1.2"
regex = "0.1"

1
lib/domain/libimagbookmark/src/lib.rs
View File

@ -33,7 +33,6 @@
while_true,
)]
extern crate semver;
extern crate url;
extern crate regex;

1
lib/domain/libimagcounter/Cargo.toml
View File

@ -17,7 +17,6 @@ homepage = "http://imag-pim.org"
log = "0.3"
toml = "0.4.*"
toml-query = "0.3.*"
semver = "0.5"
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }

16
lib/domain/libimagcounter/src/counter.rs
View File

@ -75,8 +75,8 @@ impl<'a> Counter<'a> {
let mut lockentry = try!(store.create(id).map_err_into(CEK::StoreWriteError));
{
let mut entry = lockentry.deref_mut();
let mut header = entry.get_header_mut();
let entry = lockentry.deref_mut();
let header = entry.get_header_mut();
let setres = header.set(&String::from("counter"), Value::Table(BTreeMap::new()));
if setres.is_err() {
return Err(CEK::StoreWriteError.into_error());
@ -103,7 +103,7 @@ impl<'a> Counter<'a> {
self.unit = unit;
if let Some(u) = self.unit.clone() {
let mut header = self.fle.deref_mut().get_header_mut();
let header = self.fle.deref_mut().get_header_mut();
let setres = header.set(&String::from("counter.unit"), Value::String(u.0));
if setres.is_err() {
self.unit = None;
@ -114,7 +114,7 @@ impl<'a> Counter<'a> {
}
pub fn inc(&mut self) -> Result<()> {
let mut header = self.fle.deref_mut().get_header_mut();
let header = self.fle.deref_mut().get_header_mut();
let query = String::from("counter.value");
match try!(header.read(&query).map_err_into(CEK::StoreReadError)) {
Some(&Value::Integer(i)) => {
@ -127,7 +127,7 @@ impl<'a> Counter<'a> {
}
pub fn dec(&mut self) -> Result<()> {
let mut header = self.fle.deref_mut().get_header_mut();
let header = self.fle.deref_mut().get_header_mut();
let query = String::from("counter.value");
match try!(header.read(&query).map_err_into(CEK::StoreReadError)) {
Some(&Value::Integer(i)) => {
@ -144,8 +144,10 @@ impl<'a> Counter<'a> {
}
pub fn set(&mut self, v: i64) -> Result<()> {
let mut header = self.fle.deref_mut().get_header_mut();
header.set(&String::from("counter.value"), Value::Integer(v))
self.fle
.deref_mut()
.get_header_mut()
.set(&String::from("counter.value"), Value::Integer(v))
.map_err_into(CEK::StoreWriteError)
.map(|_| ())
}

1
lib/domain/libimagcounter/src/lib.rs
View File

@ -36,7 +36,6 @@
extern crate toml;
extern crate toml_query;
#[macro_use] extern crate log;
extern crate semver;
#[macro_use] extern crate libimagstore;
#[macro_use] extern crate libimagerror;

3
lib/domain/libimagdiary/Cargo.toml
View File

@ -16,15 +16,12 @@ homepage = "http://imag-pim.org"
[dependencies]
chrono = "0.4"
log = "0.3"
semver = "0.5"
toml = "0.4.*"
toml-query = "0.3.*"
regex = "0.1"
itertools = "0.5"
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
libimagentryedit = { version = "0.4.0", path = "../../../lib/entry/libimagentryedit" }
libimagentryview = { version = "0.4.0", path = "../../../lib/entry/libimagentryview" }

3
lib/domain/libimagdiary/src/lib.rs
View File

@ -35,10 +35,8 @@
extern crate chrono;
#[macro_use] extern crate log;
extern crate semver;
extern crate toml;
extern crate toml_query;
extern crate regex;
extern crate itertools;
#[macro_use] extern crate libimagstore;
@ -46,7 +44,6 @@ extern crate itertools;
extern crate libimagentryedit;
extern crate libimagentryview;
extern crate libimagrt;
extern crate libimagutil;
module_entry_path_mod!("diary");

2
lib/domain/libimagmail/Cargo.toml
View File

@ -16,8 +16,6 @@ homepage = "http://imag-pim.org"
[dependencies]
log = "0.3"
email = "0.0.17"
semver = "0.5"
toml = "0.4.*"
filters = "0.1.*"
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }

2
lib/domain/libimagmail/src/lib.rs
View File

@ -35,8 +35,6 @@
#[macro_use] extern crate log;
extern crate email;
extern crate semver;
extern crate toml;
extern crate filters;
#[macro_use] extern crate libimagerror;

2
lib/domain/libimagnotes/Cargo.toml
View File

@ -14,7 +14,6 @@ repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
[dependencies]
semver = "0.5"
log = "0.3"
toml = "^0.4"
toml-query = "0.3.0"
@ -23,4 +22,3 @@ libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore"
libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
libimagentryedit = { version = "0.4.0", path = "../../../lib/entry/libimagentryedit" }
libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" }

2
lib/domain/libimagnotes/src/lib.rs
View File

@ -34,7 +34,6 @@
)]
#[macro_use] extern crate log;
extern crate semver;
extern crate toml;
extern crate toml_query;
@ -42,7 +41,6 @@ extern crate libimagrt;
#[macro_use] extern crate libimagstore;
#[macro_use] extern crate libimagerror;
extern crate libimagentryedit;
extern crate libimagentrytag;
module_entry_path_mod!("notes");

9
lib/domain/libimagnotes/src/note.rs
View File

@ -58,10 +58,10 @@ impl<'a> Note<'a> {
.map_err_into(NEK::StoreWriteError));
{
let mut entry = lockentry.deref_mut();
let entry = lockentry.deref_mut();
{
let mut header = entry.get_header_mut();
let header = entry.get_header_mut();
let setres = header.set("note", Value::Table(BTreeMap::new()));
if setres.is_err() {
let kind = NEK::StoreWriteError;
@ -85,8 +85,9 @@ impl<'a> Note<'a> {
}
pub fn set_name(&mut self, n: String) -> Result<()> {
let mut header = self.entry.get_header_mut();
header.set("note.name", Value::String(n))
self.entry
.get_header_mut()
.set("note.name", Value::String(n))
.map_err(|e| NE::new(NEK::StoreWriteError, Some(Box::new(e))))
.map(|_| ())
}

3
lib/domain/libimagtodo/Cargo.toml
View File

@ -14,15 +14,12 @@ repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
[dependencies]
semver = "0.2"
task-hookrs = "0.2.2"
uuid = "0.3"
toml = "0.4.*"
toml-query = "0.3.*"
is-match = "0.1.*"
log = "0.3"
serde_json = "0.8"
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }

3
lib/domain/libimagtodo/src/lib.rs
View File

@ -33,17 +33,14 @@
while_true,
)]
extern crate semver;
extern crate uuid;
extern crate toml;
extern crate toml_query;
#[macro_use] extern crate is_match;
#[macro_use] extern crate log;
extern crate serde_json;
#[macro_use] extern crate libimagstore;
#[macro_use] extern crate libimagerror;
extern crate libimagutil;
extern crate task_hookrs;
module_entry_path_mod!("todo");

9
lib/domain/libimagtodo/src/task.rs
View File

@ -220,13 +220,6 @@ impl<'a> IntoTask<'a> for TTask {
use toml_query::read::TomlValueReadExt;
use toml_query::set::TomlValueSetExt;
// Helper for toml_query::read::TomlValueReadExt::read() return value, which does only
// return Result<T> instead of Result<Option<T>>, which is a real inconvenience.
//
let no_identifier = |e: &::toml_query::error::Error| -> bool {
is_match!(e.kind(), &::toml_query::error::ErrorKind::IdentifierNotFoundInDocument(_))
};
let uuid = self.uuid();
ModuleEntryPath::new(format!("taskwarrior/{}", uuid))
.into_storeid()
@ -236,7 +229,7 @@ impl<'a> IntoTask<'a> for TTask {
.map_err_into(TEK::StoreError)
.and_then(|mut fle| {
{
let mut hdr = fle.get_header_mut();
let hdr = fle.get_header_mut();
if try!(hdr.read("todo").map_err_into(TEK::StoreError)).is_none() {
try!(hdr
.set("todo", Value::Table(BTreeMap::new()))

2
lib/entry/libimagentryannotation/Cargo.toml
View File

@ -10,7 +10,6 @@ readme = "../README.md"
license = "LGPL-2.1"
[dependencies]
uuid = { version = "0.3.1", features = ["v4"] }
lazy_static = "0.1.15"
toml = "^0.4"
toml-query = "0.3.0"
@ -19,4 +18,3 @@ libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore"
libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
libimagnotes = { version = "0.4.0", path = "../../../lib/domain/libimagnotes" }
libimagentrylink = { version = "0.4.0", path = "../../../lib/entry/libimagentrylink" }
libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }

2
lib/entry/libimagentryannotation/src/lib.rs
View File

@ -33,7 +33,6 @@
while_true,
)]
extern crate uuid;
extern crate toml;
extern crate toml_query;
@ -41,7 +40,6 @@ extern crate toml_query;
extern crate libimagstore;
extern crate libimagentrylink;
extern crate libimagnotes;
extern crate libimagutil;
pub mod annotateable;
pub mod annotation_fetcher;

1
lib/entry/libimagentrydatetime/Cargo.toml
View File

@ -21,5 +21,4 @@ toml = "0.4"
libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }

1
lib/entry/libimagentrydatetime/src/lib.rs
View File

@ -40,7 +40,6 @@ extern crate toml;
#[macro_use] extern crate libimagerror;
extern crate libimagstore;
extern crate libimagutil;
pub mod datepath;
pub mod datetime;

1
lib/entry/libimagentryfilter/src/lib.rs
View File

@ -34,7 +34,6 @@
)]
extern crate filters;
extern crate itertools;
extern crate regex;
extern crate semver;
extern crate toml;

1
lib/entry/libimagentrylink/Cargo.toml
View File

@ -17,7 +17,6 @@ homepage = "http://imag-pim.org"
itertools = "0.5"
log = "0.3"
toml = "^0.4"
semver = "0.5"
url = "1.2"
rust-crypto = "0.2"
env_logger = "0.3"

2
lib/entry/libimagentrylink/src/external.rs
View File

@ -350,7 +350,7 @@ impl ExternalLinker for Entry {
debug!("Generating header content!");
{
let mut hdr = file.deref_mut().get_header_mut();
let hdr = file.deref_mut().get_header_mut();
let mut table = match hdr.read("imag.content") {
Ok(Some(&Value::Table(ref table))) => table.clone(),

1
lib/entry/libimagentrylink/src/lib.rs
View File

@ -37,7 +37,6 @@ extern crate itertools;
#[macro_use] extern crate log;
extern crate toml;
extern crate toml_query;
extern crate semver;
extern crate url;
extern crate crypto;
#[macro_use] extern crate is_match;

1
lib/entry/libimagentrylist/Cargo.toml
View File

@ -16,7 +16,6 @@ homepage = "http://imag-pim.org"
[dependencies]
clap = ">=2.17"
log = "0.3"
toml = "^0.4"
prettytable-rs = "0.6.*"
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }

1
lib/entry/libimagentrylist/src/lib.rs
View File

@ -35,7 +35,6 @@
extern crate clap;
#[macro_use] extern crate log;
extern crate toml;
extern crate prettytable;
extern crate libimagstore;

1
lib/entry/libimagentrymarkdown/Cargo.toml
View File

@ -16,7 +16,6 @@ homepage = "http://imag-pim.org"
[dependencies]
log = "0.3"
hoedown = "5.0.0"
crossbeam = "0.2"
url = "1.2"
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }

1
lib/entry/libimagentrymarkdown/src/lib.rs
View File

@ -33,7 +33,6 @@
while_true,
)]
extern crate crossbeam;
extern crate hoedown;
extern crate url;
extern crate libimagstore;

3
lib/entry/libimagentryref/Cargo.toml
View File

@ -17,13 +17,10 @@ homepage = "http://imag-pim.org"
itertools = "0.5"
log = "0.3"
rust-crypto = "0.2"
semver = "0.5"
toml = "^0.4"
version = "2.0.1"
walkdir = "1.0.*"
toml-query = "0.3.0"
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
libimagentrylist = { version = "0.4.0", path = "../../../lib/entry/libimagentrylist" }
libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }

3
lib/entry/libimagentryref/src/lib.rs
View File

@ -36,15 +36,12 @@
#[macro_use] extern crate log;
extern crate crypto;
extern crate itertools;
extern crate semver;
extern crate toml;
extern crate toml_query;
extern crate version;
extern crate walkdir;
#[macro_use] extern crate libimagstore;
#[macro_use] extern crate libimagerror;
extern crate libimagutil;
extern crate libimagentrylist;
module_entry_path_mod!("ref");

1
lib/entry/libimagentrytag/Cargo.toml
View File

@ -25,4 +25,3 @@ toml-query = "0.3.0"
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }

1
lib/entry/libimagentrytag/src/lib.rs
View File

@ -44,7 +44,6 @@ extern crate filters;
extern crate libimagstore;
#[macro_use] extern crate libimagerror;
extern crate libimagutil;
pub mod error;
pub mod exec;

1
lib/entry/libimagentryview/Cargo.toml
View File

@ -16,7 +16,6 @@ homepage = "http://imag-pim.org"
[dependencies]
log = "0.3"
toml = "^0.4"
glob = "0.2"
libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }

1
lib/entry/libimagentryview/src/lib.rs
View File

@ -33,7 +33,6 @@
while_true,
)]
extern crate glob;
extern crate toml;
extern crate libimagstore;

4
lib/etc/libimaginteraction/Cargo.toml
View File

@ -21,10 +21,6 @@ lazy_static = "0.2.*"
log = "0.3"
regex = "0.2"
toml = "^0.4"
spinner = "0.4"
rustyline = "1.0"
libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
libimagentryfilter = { version = "0.4.0", path = "../../../lib/entry/libimagentryfilter" }

4
lib/etc/libimaginteraction/src/lib.rs
View File

@ -33,18 +33,14 @@
while_true,
)]
extern crate spinner;
extern crate interactor;
extern crate ansi_term;
#[macro_use] extern crate lazy_static;
extern crate regex;
extern crate clap;
extern crate toml;
extern crate rustyline;
extern crate libimagentryfilter;
extern crate libimagstore;
extern crate libimagutil;
#[macro_use] extern crate libimagerror;
pub mod ask;