greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Update dependency versions. Fix minor warnings.

Browse source
This commit is contained in:
Gregory Burd 2020-05-12 10:21:51 -04:00
parent b428579865
commit bf1ac14d32
23 changed files with 96 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Cargo.toml
View file

@ -38,17 +38,16 @@ features = ["run-for-all", "precommit-hook", "run-cargo-fmt", "run-cargo-test",
[dependencies] [dependencies]
chrono = "0.4" chrono = "0.4"
failure = "0.1.6" failure = "0.1"
lazy_static = "1.4.0" lazy_static = "1.4"
time = "0.2" time = "0.2.15"
log = "0.4" log = "0.4"
uuid = { version = "0.8", features = ["v4", "serde"] } uuid = { version = "0.8", features = ["v4", "serde"] }
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.22.0" version = "0.23"
# System sqlite might be very old. features = ["limits", "bundled"]
features = ["limits"]
[dependencies.edn] [dependencies.edn]
path = "edn" path = "edn"

4
core-traits/Cargo.toml
View file

@ -10,8 +10,8 @@ path = "lib.rs"
[dependencies] [dependencies]
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
enum-set = "0.0.8" enum-set = "0.0.8"
lazy_static = "1.4.0" lazy_static = "1.4"
indexmap = "1.3.1" indexmap = "1.3"
ordered-float = { version = "1.0.2", features = ["serde"] } ordered-float = { version = "1.0.2", features = ["serde"] }
uuid = { version = "0.8", features = ["v4", "serde"] } uuid = { version = "0.8", features = ["v4", "serde"] }
serde = { version = "1.0", features = ["rc"] } serde = { version = "1.0", features = ["rc"] }

4
db-traits/Cargo.toml
View file

@ -21,5 +21,5 @@ path = "../edn"
path = "../core-traits" path = "../core-traits"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.22" version = "0.23"
features = ["limits"] features = ["limits", "bundled"]

12
db/Cargo.toml
View file

@ -9,12 +9,12 @@ sqlcipher = ["rusqlite/sqlcipher"]
syncable = ["serde", "serde_json", "serde_derive"] syncable = ["serde", "serde_json", "serde_derive"]
[dependencies] [dependencies]
failure = "0.1.6" failure = "0.1"
indexmap = "1.3.1" indexmap = "1.3"
itertools = "0.9" itertools = "0.9"
lazy_static = "1.4.0" lazy_static = "1.4"
log = "0.4" log = "0.4"
ordered-float = "1.0.2" ordered-float = "1.0"
time = "0.2" time = "0.2"
petgraph = "0.5" petgraph = "0.5"
serde = { version = "1.0", optional = true } serde = { version = "1.0", optional = true }
@ -22,8 +22,8 @@ serde_json = { version = "1.0", optional = true }
serde_derive = { version = "1.0", optional = true } serde_derive = { version = "1.0", optional = true }
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.22" version = "0.23"
features = ["limits"] features = ["limits", "bundled"]
[dependencies.edn] [dependencies.edn]
path = "../edn" path = "../edn"

2
db/src/cache.rs
View file

@ -375,7 +375,7 @@ impl RemoveFromCache for MultiValAttributeCache {
impl CardinalityManyCache for MultiValAttributeCache { impl CardinalityManyCache for MultiValAttributeCache {
fn acc(&mut self, e: Entid, v: TypedValue) { fn acc(&mut self, e: Entid, v: TypedValue) {
self.e_vs.entry(e).or_insert_with(|| vec![]).push(v) self.e_vs.entry(e).or_insert_with(Vec::new).push(v)
} }
fn set(&mut self, e: Entid, vs: Vec<TypedValue>) { fn set(&mut self, e: Entid, vs: Vec<TypedValue>) {

2
db/src/metadata.rs
View file

@ -111,7 +111,7 @@ fn update_attribute_map_from_schema_retractions(
let mut eas = BTreeMap::new(); let mut eas = BTreeMap::new();
for (e, a, v) in retractions.into_iter() { for (e, a, v) in retractions.into_iter() {
if entids::is_a_schema_attribute(a) { if entids::is_a_schema_attribute(a) {
eas.entry(e).or_insert_with(|| vec![]).push(a); eas.entry(e).or_insert_with(Vec::new).push(a);
suspect_retractions.push((e, a, v)); suspect_retractions.push((e, a, v));
} else { } else {
filtered_retractions.push((e, a, v)); filtered_retractions.push((e, a, v));

4
db/src/upsert_resolution.rs
View file

@ -276,7 +276,7 @@ impl Generation {
if attribute.unique == Some(attribute::Unique::Identity) { if attribute.unique == Some(attribute::Unique::Identity) {
tempid_avs tempid_avs
.entry((*a, Right(t2.clone()))) .entry((*a, Right(t2.clone())))
.or_insert_with(|| vec![]) .or_insert_with(Vec::new)
.push(t1.clone()); .push(t1.clone());
} }
} }
@ -286,7 +286,7 @@ impl Generation {
if attribute.unique == Some(attribute::Unique::Identity) { if attribute.unique == Some(attribute::Unique::Identity) {
tempid_avs tempid_avs
.entry((*a, x.clone())) .entry((*a, x.clone()))
.or_insert_with(|| vec![]) .or_insert_with(Vec::new)
.push(t.clone()); .push(t.clone());
} }
} }

4
edn/src/query.rs
View file

@ -1030,8 +1030,8 @@ impl ParsedQuery {
Ok(ParsedQuery { Ok(ParsedQuery {
find_spec: find_spec.ok_or("expected :find")?, find_spec: find_spec.ok_or("expected :find")?,
default_source: SrcVar::DefaultSrc, default_source: SrcVar::DefaultSrc,
with: with.unwrap_or_else(|| vec![]), with: with.unwrap_or_else(Vec::new), //
in_vars: in_vars.unwrap_or_else(|| vec![]), in_vars: in_vars.unwrap_or_else(Vec::new),
in_sources: BTreeSet::default(), in_sources: BTreeSet::default(),
limit: limit.unwrap_or(Limit::None), limit: limit.unwrap_or(Limit::None),
where_clauses: where_clauses.ok_or("expected :where")?, where_clauses: where_clauses.ok_or("expected :where")?,

4
public-traits/Cargo.toml
View file

@ -20,8 +20,8 @@ tokio-core = "0.1"
uuid = "0.8" uuid = "0.8"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.22" version = "0.23"
features = ["limits"] features = ["limits", "bundled"]
[dependencies.edn] [dependencies.edn]
path = "../edn" path = "../edn"

2
query-algebrizer/Cargo.toml
View file

@ -4,7 +4,7 @@ version = "0.0.1"
workspace = ".." workspace = ".."
[dependencies] [dependencies]
failure = "0.1.1" failure = "0.1"
[dependencies.edn] [dependencies.edn]
path = "../edn" path = "../edn"

4
query-algebrizer/src/clauses/ground.rs
View file

@ -129,7 +129,7 @@ impl ConjoiningClauses {
if where_fn.binding.is_empty() { if where_fn.binding.is_empty() {
// The binding must introduce at least one bound variable. // The binding must introduce at least one bound variable.
bail!(AlgebrizerError::InvalidBinding( bail!(AlgebrizerError::InvalidBinding(
where_fn.operator.clone(), where_fn.operator,
BindingError::NoBoundVariable BindingError::NoBoundVariable
)); ));
} }
@ -137,7 +137,7 @@ impl ConjoiningClauses {
if !where_fn.binding.is_valid() { if !where_fn.binding.is_valid() {
// The binding must not duplicate bound variables. // The binding must not duplicate bound variables.
bail!(AlgebrizerError::InvalidBinding( bail!(AlgebrizerError::InvalidBinding(
where_fn.operator.clone(), where_fn.operator,
BindingError::RepeatedBoundVariable BindingError::RepeatedBoundVariable
)); ));
} }

2
query-algebrizer/src/clauses/mod.rs
View file

@ -508,7 +508,7 @@ impl ConjoiningClauses {
self.column_bindings self.column_bindings
.entry(var) .entry(var)
.or_insert_with(|| vec![]) .or_insert_with(Vec::new)
.push(alias); .push(alias);
} }

2
query-algebrizer/src/clauses/or.rs
View file

@ -727,7 +727,7 @@ fn union_types(
for (var, new_types) in additional_types { for (var, new_types) in additional_types {
match into.entry(var.clone()) { match into.entry(var.clone()) {
Entry::Vacant(e) => { Entry::Vacant(e) => {
e.insert(new_types.clone()); e.insert(*new_types);
} }
Entry::Occupied(mut e) => { Entry::Occupied(mut e) => {
let new = e.get().union(*new_types); let new = e.get().union(*new_types);

6
query-algebrizer/src/clauses/predicate.rs
View file

@ -98,7 +98,7 @@ impl ConjoiningClauses {
.intersection(supported_types); .intersection(supported_types);
if left_types.is_empty() { if left_types.is_empty() {
bail!(AlgebrizerError::InvalidArgumentType( bail!(AlgebrizerError::InvalidArgumentType(
predicate.operator.clone(), predicate.operator,
supported_types, supported_types,
0 0
)); ));
@ -109,7 +109,7 @@ impl ConjoiningClauses {
.intersection(supported_types); .intersection(supported_types);
if right_types.is_empty() { if right_types.is_empty() {
bail!(AlgebrizerError::InvalidArgumentType( bail!(AlgebrizerError::InvalidArgumentType(
predicate.operator.clone(), predicate.operator,
supported_types, supported_types,
1 1
)); ));
@ -161,7 +161,7 @@ impl ConjoiningClauses {
right_v = self.resolve_ref_argument(known.schema, &predicate.operator, 1, right)?; right_v = self.resolve_ref_argument(known.schema, &predicate.operator, 1, right)?;
} else { } else {
bail!(AlgebrizerError::InvalidArgumentType( bail!(AlgebrizerError::InvalidArgumentType(
predicate.operator.clone(), predicate.operator,
supported_types, supported_types,
0 0
)); ));

4
query-projector-traits/Cargo.toml
View file

@ -15,8 +15,8 @@ failure = "0.1"
failure_derive = "0.1" failure_derive = "0.1"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.22" version = "0.23"
features = ["limits"] features = ["limits", "bundled"]
[dependencies.edn] [dependencies.edn]
path = "../edn" path = "../edn"

4
query-projector/Cargo.toml
View file

@ -11,8 +11,8 @@ failure = "0.1"
indexmap = "1.3" indexmap = "1.3"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.22" version = "0.23"
features = ["limits"] features = ["limits", "bundled"]
[dependencies.core_traits] [dependencies.core_traits]
path = "../core-traits" path = "../core-traits"

6
query-pull/Cargo.toml
View file

@ -7,14 +7,14 @@ workspace = ".."
sqlcipher = ["rusqlite/sqlcipher"] sqlcipher = ["rusqlite/sqlcipher"]
[dependencies] [dependencies]
failure = "0.1.1" failure = "0.1"
[dependencies.query_pull_traits] [dependencies.query_pull_traits]
path = "../query-pull-traits" path = "../query-pull-traits"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.22" version = "0.23"
features = ["limits"] features = ["limits", "bundled"]
[dependencies.edn] [dependencies.edn]
path = "../edn" path = "../edn"

5
query-sql/Cargo.toml
View file

@ -3,8 +3,9 @@ name = "mentat_query_sql"
version = "0.0.1" version = "0.0.1"
workspace = ".." workspace = ".."
[dependencies] [dependencies.rusqlite]
rusqlite = "0.22" version = "0.23"
features = ["limits", "bundled"]
[dependencies.edn] [dependencies.edn]
path = "../edn" path = "../edn"

4
sql/Cargo.toml
View file

@ -11,8 +11,8 @@ failure = "0.1"
ordered-float = "1.0" ordered-float = "1.0"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.22" version = "0.23"
features = ["limits"] features = ["limits", "bundled"]
[dependencies.core_traits] [dependencies.core_traits]
path = "../core-traits" path = "../core-traits"

4
tolstoy-traits/Cargo.toml
View file

@ -22,5 +22,5 @@ uuid = { version = "0.8" }
path = "../db-traits" path = "../db-traits"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.22" version = "0.23"
features = ["limits"] features = ["limits", "bundled"]

4
tolstoy/Cargo.toml
View file

@ -51,5 +51,5 @@ path = "../public-traits"
path = "../transaction" path = "../transaction"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.22" version = "0.23"
features = ["limits"] features = ["limits", "bundled"]

4
tools/cli/Cargo.toml
View file

@ -34,8 +34,8 @@ termion = "1.5"
time = "0.2" time = "0.2"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.22" version = "0.23"
features = ["limits"] features = ["limits", "bundled"]
[dependencies.mentat] [dependencies.mentat]
path = "../.." path = "../.."

4
transaction/Cargo.toml
View file

@ -43,5 +43,5 @@ path = "../query-pull"
path = "../query-sql" path = "../query-sql"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "0.22" version = "0.23"
features = ["limits"] features = ["limits", "bundled"]