matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Update toml-query to 0.9.0

Browse source 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-05-29 12:46:16 +02:00
parent 1482f70320
commit a7d53e47d1
42 changed files with 56 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/core/imag-annotate/Cargo.toml
View file

@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
log = "0.4.0"
url = "1.2"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
failure = "0.1"
libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

2
bin/core/imag-category/Cargo.toml
View file

@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
failure = "0.1"
libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

2
bin/core/imag-diagnostics/Cargo.toml
View file

@ -16,7 +16,7 @@ homepage = "http://imag-pim.org"
[dependencies]
log = "0.4"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
indicatif = "0.9"
failure = "0.1"

2
bin/core/imag-edit/Cargo.toml
View file

@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
log = "0.4"
version = "3"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
failure = "0.1"
libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

2
bin/core/imag-git/Cargo.toml
View file

@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
libimagrt = { version = "0.10.0", path = "../../../lib/core/libimagrt" }
libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" }

2
bin/core/imag-gps/Cargo.toml
View file

@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
log = "0.4.0"
url = "1.2"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
failure = "0.1"
libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

2
bin/core/imag-header/Cargo.toml
View file

@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
log = "0.4"
version = "2.0.1"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
filters = "0.3"
failure = "0.1"

2
bin/core/imag-ids/Cargo.toml
View file

@ -24,7 +24,7 @@ filters = "0.3"
nom = "3.2"
log = "0.4"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
is-match = "0.1"
failure = "0.1"

2
bin/core/imag-link/Cargo.toml
View file

@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
log = "0.4.0"
url = "1.5"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
prettytable-rs = "0.8"
failure = "0.1"

2
bin/core/imag-store/Cargo.toml
View file

@ -50,5 +50,5 @@ default-features = false
features = ["testing"]
[dev-dependencies.toml-query]
version = "0.8"
version = "0.9"

2
bin/core/imag-tag/Cargo.toml
View file

@ -36,7 +36,7 @@ default-features = false
features = ["color", "suggestions", "wrap_help"]
[dev-dependencies]
toml-query = "0.8"
toml-query = "0.9"
env_logger = "0.5"
[dev-dependencies.libimagutil]

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

@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
handlebars = "1.0"
tempfile = "3"
failure = "0.1"

2
bin/core/imag/Cargo.toml
View file

@ -33,7 +33,7 @@ maintenance = { status = "actively-developed" }
walkdir = "2"
log = "0.4.0"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" }
libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

2
bin/domain/imag-bookmark/Cargo.toml
View file

@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
failure = "0.1"
libimagrt = { version = "0.10.0", path = "../../../lib/core/libimagrt" }

4
bin/domain/imag-contact/Cargo.toml
View file

@ -44,8 +44,6 @@ default-features = false
features = ["color", "suggestions", "wrap_help"]
[dependencies.toml-query]
#version = "0.8"
version = "0.9"
default-features = false
features = ["typed"]
git = "https://github.com/matthiasbeyer/toml-query"
branch = "master"

2
bin/domain/imag-diary/Cargo.toml
View file

@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
chrono = "0.4"
log = "0.4.0"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
itertools = "0.7"
failure = "0.1"

2
bin/domain/imag-habit/Cargo.toml
View file

@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
chrono = "0.4"
log = "0.4"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
kairos = "0.3"
prettytable-rs = "0.8"
failure = "0.1"

2
bin/domain/imag-log/Cargo.toml
View file

@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
is-match = "0.1"
itertools = "0.7"
failure = "0.1"

2
bin/domain/imag-mail/Cargo.toml
View file

@ -37,7 +37,7 @@ default-features = false
features = ["color", "suggestions", "wrap_help"]
[dependencies.toml-query]
version = "0.8"
version = "0.9"
default-features = false
features = ["typed"]

2
bin/domain/imag-todo/Cargo.toml
View file

@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
is-match = "0.1"
failure = "0.1"

2
bin/domain/imag-wiki/Cargo.toml
View file

@ -17,7 +17,7 @@ homepage = "http://imag-pim.org"
clap = ">=2.17"
log = "0.4"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
is-match = "0.1"
regex = "1"
filters = "0.3"

2
lib/core/libimagrt/Cargo.toml
View file

@ -25,7 +25,7 @@ toml = "0.5"
xdg-basedir = "1.0"
itertools = "0.7"
ansi_term = "0.11"
toml-query = "0.8"
toml-query = "0.9"
atty = "0.2"
failure = "0.1"
failure_derive = "0.1"

2
lib/core/libimagstore/Cargo.toml
View file

@ -29,7 +29,7 @@ walkdir = "2"
is-match = "0.1"
serde = "1"
serde_json = "1"
toml-query = "0.8"
toml-query = "0.9"
failure = "0.1"
libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" }

29
lib/core/libimagstore/src/store.rs
View file

@ -18,7 +18,6 @@
//
use std::collections::HashMap;
use std::collections::BTreeMap;
use std::ops::Drop;
use std::path::PathBuf;
use std::result::Result as RResult;
@ -774,11 +773,13 @@ impl Entry {
///
/// This function should be used to get a new Header, as the default header may change. Via
/// this function, compatibility is ensured.
pub fn default_header() -> Value { // BTreeMap<String, Value>
let mut m = BTreeMap::new();
pub fn default_header() -> Value { // Map<String, Value>
use toml::map::Map;
let mut m = Map::new();
m.insert(String::from("imag"), {
let mut imag_map = BTreeMap::<String, Value>::new();
let mut imag_map = Map::new();
imag_map.insert(String::from("version"),
Value::String(String::from(env!("CARGO_PKG_VERSION"))));
@ -930,12 +931,12 @@ fn has_imag_version_in_main_section(t: &Value) -> Result<bool> {
mod test {
extern crate env_logger;
use std::collections::BTreeMap;
use crate::storeid::StoreId;
use crate::store::has_main_section;
use crate::store::has_imag_version_in_main_section;
use toml::Value;
use toml::map::Map;
fn setup_logging() {
let _ = env_logger::try_init();
@ -943,15 +944,15 @@ mod test {
#[test]
fn test_imag_section() {
let mut map = BTreeMap::new();
map.insert("imag".into(), Value::Table(BTreeMap::new()));
let mut map = Map::new();
map.insert("imag".into(), Value::Table(Map::new()));
assert!(has_main_section(&Value::Table(map)).unwrap());
}
#[test]
fn test_imag_abscent_main_section() {
let mut map = BTreeMap::new();
let mut map = Map::new();
map.insert("not_imag".into(), Value::Boolean(false));
assert!(has_main_section(&Value::Table(map)).is_err());
@ -959,16 +960,16 @@ mod test {
#[test]
fn test_main_section_without_version() {
let mut map = BTreeMap::new();
map.insert("imag".into(), Value::Table(BTreeMap::new()));
let mut map = Map::new();
map.insert("imag".into(), Value::Table(Map::new()));
assert!(has_imag_version_in_main_section(&Value::Table(map)).is_err());
}
#[test]
fn test_main_section_with_version() {
let mut map = BTreeMap::new();
let mut sub = BTreeMap::new();
let mut map = Map::new();
let mut sub = Map::new();
sub.insert("version".into(), Value::String("0.0.0".into()));
map.insert("imag".into(), Value::Table(sub));
@ -977,8 +978,8 @@ mod test {
#[test]
fn test_main_section_with_version_in_wrong_type() {
let mut map = BTreeMap::new();
let mut sub = BTreeMap::new();
let mut map = Map::new();
let mut sub = Map::new();
sub.insert("version".into(), Value::Boolean(false));
map.insert("imag".into(), Value::Table(sub));

2
lib/domain/libimagcontact/Cargo.toml
View file

@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
failure = "0.1"
log = "0.4"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
vobject = "0.7"
uuid = "0.7"
serde = "1"

2
lib/domain/libimagdiary/Cargo.toml
View file

@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
chrono = "0.4"
log = "0.4.0"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
itertools = "0.7"
failure = "0.1"
filters = "0.3"

2
lib/domain/libimaghabit/Cargo.toml
View file

@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
chrono = "0.4"
log = "0.4"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
kairos = "0.3"
failure = "0.1"

2
lib/domain/libimaglog/Cargo.toml
View file

@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
failure = "0.1"
libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

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

@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
mailparse = "0.6.5"
filters = "0.3"
failure = "0.1"

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

@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
failure = "0.1"
libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

2
lib/domain/libimagtimetrack/Cargo.toml
View file

@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
filters = "0.3"
chrono = "0.4"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
lazy_static = "1.2"
is-match = "0.1"
failure = "0.1"

2
lib/domain/libimagtodo/Cargo.toml
View file

@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
task-hookrs = "0.6.0"
uuid = "0.7"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
log = "0.4.0"
serde_json = "1"
failure = "0.1"

2
lib/domain/libimagwiki/Cargo.toml
View file

@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
filters = "0.3"
failure = "0.1"

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

@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
lazy_static = "1.2"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
failure = "0.1"
failure_derive = "0.1"
uuid = { version = "0.7", features = ["v4"] }

2
lib/entry/libimagentrycategory/Cargo.toml
View file

@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
failure = "0.1"
libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" }

2
lib/entry/libimagentrydatetime/Cargo.toml
View file

@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
chrono = "0.4"
toml-query = "0.8"
toml-query = "0.9"
toml = "0.5"
failure = "0.1"

2
lib/entry/libimagentryfilter/Cargo.toml
View file

@ -26,7 +26,7 @@ log = "0.4.0"
regex = "1"
semver = "0.9"
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
failure = "0.1"
failure_derive = "0.1"

2
lib/entry/libimagentrygps/Cargo.toml
View file

@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
serde_derive = "1"
serde = "1"
failure = "0.1"

2
lib/entry/libimagentrylink/Cargo.toml
View file

@ -27,7 +27,7 @@ url = "1.5"
sha-1 = "0.7"
hex = "0.3"
is-match = "0.1"
toml-query = "0.8"
toml-query = "0.9"
failure = "0.1"
failure_derive = "0.1"

4
lib/entry/libimagentryref/Cargo.toml
View file

@ -34,11 +34,9 @@ libimagrt = { version = "0.10.0", path = "../../../lib/core/libimagrt" }
libimagentryutil = { version = "0.10.0", path = "../../../lib/entry/libimagentryutil" }
[dependencies.toml-query]
#version = "0.8"
version = "0.9"
default-features = false
features = ["typed"]
git = "https://github.com/matthiasbeyer/toml-query"
branch = "master"
[dev-dependencies]
env_logger = "0.5"

2
lib/entry/libimagentrytag/Cargo.toml
View file

@ -26,7 +26,7 @@ toml = "0.5"
itertools = "0.7"
is-match = "0.1"
filters = "0.3"
toml-query = "0.8"
toml-query = "0.9"
failure = "0.1"
libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

2
lib/entry/libimagentryutil/Cargo.toml
View file

@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
toml = "0.5"
toml-query = "0.8"
toml-query = "0.9"
filters = "0.3"
failure = "0.1"
log = "0.4"