Minor version adjustments and fixes.
This commit is contained in:
parent
bf1ac14d32
commit
5899bf8624
22 changed files with 155 additions and 155 deletions
21
Cargo.toml
21
Cargo.toml
|
@ -14,7 +14,7 @@ authors = [
|
|||
"Gregory Burd <greg@burd.me>",
|
||||
]
|
||||
name = "mentat"
|
||||
version = "0.11.2"
|
||||
version = "0.12.0"
|
||||
build = "build/version.rs"
|
||||
|
||||
[features]
|
||||
|
@ -27,26 +27,25 @@ syncable = ["mentat_tolstoy", "tolstoy_traits", "mentat_db/syncable"]
|
|||
members = ["tools/cli", "ffi"]
|
||||
|
||||
[build-dependencies]
|
||||
rustc_version = "0.2"
|
||||
rustc_version = "~0.2"
|
||||
|
||||
[dev-dependencies.cargo-husky]
|
||||
version = "1"
|
||||
default-features = false # Disable features which are enabled by default
|
||||
features = ["run-for-all", "precommit-hook", "run-cargo-fmt", "run-cargo-test", "run-cargo-check", "run-cargo-clippy"]
|
||||
# cargo audit
|
||||
# cargo outdated
|
||||
#cargo audit
|
||||
#cargo outdated
|
||||
|
||||
[dependencies]
|
||||
chrono = "0.4"
|
||||
failure = "0.1"
|
||||
lazy_static = "1.4"
|
||||
chrono = "~0.4"
|
||||
failure = "~0.1"
|
||||
lazy_static = "~1.4"
|
||||
time = "0.2.15"
|
||||
log = "0.4"
|
||||
uuid = { version = "0.8", features = ["v4", "serde"] }
|
||||
|
||||
log = "~0.4"
|
||||
uuid = { version = "~0.8", features = ["v4", "serde"] }
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "0.23"
|
||||
version = "~0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
||||
[dependencies.edn]
|
||||
|
|
|
@ -14,7 +14,7 @@ use std::process::exit;
|
|||
|
||||
/// MIN_VERSION should be changed when there's a new minimum version of rustc required
|
||||
/// to build the project.
|
||||
static MIN_VERSION: &str = "1.40.0";
|
||||
static MIN_VERSION: &str = "1.43.0";
|
||||
|
||||
fn main() {
|
||||
let ver = version().unwrap();
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "core_traits"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[lib]
|
||||
|
@ -8,14 +8,14 @@ name = "core_traits"
|
|||
path = "lib.rs"
|
||||
|
||||
[dependencies]
|
||||
chrono = { version = "0.4", features = ["serde"] }
|
||||
enum-set = "0.0.8"
|
||||
lazy_static = "1.4"
|
||||
indexmap = "1.3"
|
||||
ordered-float = { version = "1.0.2", features = ["serde"] }
|
||||
uuid = { version = "0.8", features = ["v4", "serde"] }
|
||||
serde = { version = "1.0", features = ["rc"] }
|
||||
serde_derive = "1.0"
|
||||
chrono = { version = "~0.4", features = ["serde"] }
|
||||
enum-set = "~0.0.8"
|
||||
lazy_static = "~1.4"
|
||||
indexmap = "~1.3"
|
||||
ordered-float = { version = "~1.0.2", features = ["serde"] }
|
||||
uuid = { version = "~0.8", features = ["v4", "serde"] }
|
||||
serde = { version = "~1.0", features = ["rc"] }
|
||||
serde_derive = "~1.0"
|
||||
|
||||
[dependencies.edn]
|
||||
path = "../edn"
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
[package]
|
||||
name = "mentat_core"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[dependencies]
|
||||
chrono = { version = "0.4", features = ["serde"] }
|
||||
enum-set = "0.0"
|
||||
failure = "0.1"
|
||||
indexmap = "1.3"
|
||||
ordered-float = { version = "1.0", features = ["serde"] }
|
||||
uuid = { version = "0.8", features = ["v4", "serde"] }
|
||||
chrono = { version = "~0.4", features = ["serde"] }
|
||||
enum-set = "~0.0"
|
||||
failure = "~0.1"
|
||||
indexmap = "~1.3"
|
||||
ordered-float = { version = "~1.0", features = ["serde"] }
|
||||
uuid = { version = "~0.8", features = ["v4", "serde"] }
|
||||
|
||||
[dependencies.core_traits]
|
||||
path = "../core-traits"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "db_traits"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[lib]
|
||||
|
@ -11,8 +11,8 @@ path = "lib.rs"
|
|||
sqlcipher = ["rusqlite/sqlcipher"]
|
||||
|
||||
[dependencies]
|
||||
failure = "0.1"
|
||||
failure_derive = "0.1"
|
||||
failure = "~0.1"
|
||||
failure_derive = "~0.1"
|
||||
|
||||
[dependencies.edn]
|
||||
path = "../edn"
|
||||
|
@ -21,5 +21,5 @@ path = "../edn"
|
|||
path = "../core-traits"
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "0.23"
|
||||
version = "~0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "mentat_db"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[features]
|
||||
|
@ -9,20 +9,20 @@ sqlcipher = ["rusqlite/sqlcipher"]
|
|||
syncable = ["serde", "serde_json", "serde_derive"]
|
||||
|
||||
[dependencies]
|
||||
failure = "0.1"
|
||||
indexmap = "1.3"
|
||||
itertools = "0.9"
|
||||
lazy_static = "1.4"
|
||||
log = "0.4"
|
||||
ordered-float = "1.0"
|
||||
time = "0.2"
|
||||
petgraph = "0.5"
|
||||
serde = { version = "1.0", optional = true }
|
||||
serde_json = { version = "1.0", optional = true }
|
||||
serde_derive = { version = "1.0", optional = true }
|
||||
failure = "~0.1"
|
||||
indexmap = "~1.3"
|
||||
itertools = "~0.9"
|
||||
lazy_static = "~1.4"
|
||||
log = "~0.4"
|
||||
ordered-float = "~1.0"
|
||||
time = "~0.2"
|
||||
petgraph = "~0.5"
|
||||
serde = { version = "~1.0", optional = true }
|
||||
serde_json = { version = "~1.0", optional = true }
|
||||
serde_derive = { version = "~1.0", optional = true }
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "0.23"
|
||||
version = "~0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
||||
[dependencies.edn]
|
||||
|
@ -40,9 +40,10 @@ path = "../db-traits"
|
|||
[dependencies.mentat_sql]
|
||||
path = "../sql"
|
||||
|
||||
# Should be dev-dependencies.
|
||||
# TODO: This should be in dev-dependencies.
|
||||
[dependencies.tabwriter]
|
||||
version = "1.2.1"
|
||||
version = "~1.2"
|
||||
|
||||
[dev-dependencies]
|
||||
env_logger = "0.7"
|
||||
#tabwriter = { version = "1.2.1" }
|
||||
|
|
|
@ -10,19 +10,19 @@ description = "EDN parser for Project Mentat"
|
|||
readme = "./README.md"
|
||||
|
||||
[dependencies]
|
||||
chrono = "0.4"
|
||||
itertools = "0.9"
|
||||
num = "0.2"
|
||||
ordered-float = "1.0"
|
||||
pretty = "0.10"
|
||||
uuid = { version = "0.8", features = ["v4", "serde"] }
|
||||
serde = { version = "1.0", optional = true }
|
||||
serde_derive = { version = "1.0", optional = true }
|
||||
peg = "0.6"
|
||||
chrono = "~0.4"
|
||||
itertools = "~0.9"
|
||||
num = "~0.2"
|
||||
ordered-float = "~1.0"
|
||||
pretty = "~0.10"
|
||||
uuid = { version = "~0.8", features = ["v4", "serde"] }
|
||||
serde = { version = "~1.0", optional = true }
|
||||
serde_derive = { version = "~1.0", optional = true }
|
||||
peg = "~0.6"
|
||||
|
||||
[dev-dependencies]
|
||||
serde_test = "1.0"
|
||||
serde_json = "1.0"
|
||||
serde_test = "~1.0"
|
||||
serde_json = "~1.0"
|
||||
|
||||
[features]
|
||||
serde_support = ["serde", "serde_derive"]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "mentat_ffi"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
authors = ["Emily Toop <etoop@mozilla.com>"]
|
||||
|
||||
[lib]
|
||||
|
@ -13,7 +13,7 @@ sqlcipher = ["mentat/sqlcipher"]
|
|||
bundled_sqlite3 = ["mentat/bundled_sqlite3"]
|
||||
|
||||
[dependencies]
|
||||
libc = "0.2"
|
||||
libc = "~0.2"
|
||||
|
||||
[dependencies.mentat]
|
||||
path = "../"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "public_traits"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[lib]
|
||||
|
@ -13,16 +13,24 @@ sqlcipher = ["rusqlite/sqlcipher"]
|
|||
syncable = ["tolstoy_traits", "hyper", "serde_json"]
|
||||
|
||||
[dependencies]
|
||||
failure = "0.1"
|
||||
failure_derive = "0.1"
|
||||
http = "0.2"
|
||||
tokio-core = "0.1"
|
||||
uuid = "0.8"
|
||||
failure = "~0.1"
|
||||
failure_derive = "~0.1"
|
||||
http = "~0.2"
|
||||
tokio-core = "~0.1"
|
||||
uuid = "~0.8"
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "0.23"
|
||||
version = "~0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
||||
[dependencies.hyper]
|
||||
version = "~0.13"
|
||||
optional = true
|
||||
|
||||
[dependencies.serde_json]
|
||||
version = "~1.0"
|
||||
optional = true
|
||||
|
||||
[dependencies.edn]
|
||||
path = "../edn"
|
||||
|
||||
|
@ -47,11 +55,3 @@ path = "../sql-traits"
|
|||
[dependencies.tolstoy_traits]
|
||||
path = "../tolstoy-traits"
|
||||
optional = true
|
||||
|
||||
[dependencies.hyper]
|
||||
version = "0.13"
|
||||
optional = true
|
||||
|
||||
[dependencies.serde_json]
|
||||
version = "1.0"
|
||||
optional = true
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "query_algebrizer_traits"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[lib]
|
||||
|
@ -8,8 +8,8 @@ name = "query_algebrizer_traits"
|
|||
path = "lib.rs"
|
||||
|
||||
[dependencies]
|
||||
failure = "0.1"
|
||||
failure_derive = "0.1"
|
||||
failure = "~0.1"
|
||||
failure_derive = "~0.1"
|
||||
|
||||
[dependencies.edn]
|
||||
path = "../edn"
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
[package]
|
||||
name = "mentat_query_algebrizer"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[dependencies]
|
||||
failure = "0.1"
|
||||
failure = "~0.1"
|
||||
|
||||
[dependencies.edn]
|
||||
path = "../edn"
|
||||
|
@ -19,4 +19,4 @@ path = "../core-traits"
|
|||
path = "../query-algebrizer-traits"
|
||||
|
||||
[dev-dependencies]
|
||||
itertools = "0.9"
|
||||
itertools = "~0.9"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "query_projector_traits"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[lib]
|
||||
|
@ -11,11 +11,11 @@ path = "lib.rs"
|
|||
sqlcipher = ["rusqlite/sqlcipher"]
|
||||
|
||||
[dependencies]
|
||||
failure = "0.1"
|
||||
failure_derive = "0.1"
|
||||
failure = "~0.1"
|
||||
failure_derive = "~0.1"
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "0.23"
|
||||
version = "~0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
||||
[dependencies.edn]
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
[package]
|
||||
name = "mentat_query_projector"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[features]
|
||||
sqlcipher = ["rusqlite/sqlcipher"]
|
||||
|
||||
[dependencies]
|
||||
failure = "0.1"
|
||||
indexmap = "1.3"
|
||||
failure = "~0.1"
|
||||
indexmap = "~1.3"
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "0.23"
|
||||
version = "~0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
||||
[dependencies.core_traits]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "query_pull_traits"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[lib]
|
||||
|
@ -8,8 +8,8 @@ name = "query_pull_traits"
|
|||
path = "lib.rs"
|
||||
|
||||
[dependencies]
|
||||
failure = "0.1"
|
||||
failure_derive = "0.1"
|
||||
failure = "~0.1"
|
||||
failure_derive = "~0.1"
|
||||
|
||||
[dependencies.core_traits]
|
||||
path = "../core-traits"
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
[package]
|
||||
name = "mentat_query_pull"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[features]
|
||||
sqlcipher = ["rusqlite/sqlcipher"]
|
||||
|
||||
[dependencies]
|
||||
failure = "0.1"
|
||||
failure = "~0.1"
|
||||
|
||||
[dependencies.query_pull_traits]
|
||||
path = "../query-pull-traits"
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "0.23"
|
||||
version = "~0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
||||
[dependencies.edn]
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
[package]
|
||||
name = "mentat_query_sql"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "0.23"
|
||||
version = "~0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
||||
[dependencies.edn]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "sql_traits"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[lib]
|
||||
|
@ -8,5 +8,5 @@ name = "sql_traits"
|
|||
path = "lib.rs"
|
||||
|
||||
[dependencies]
|
||||
failure = "0.1.1"
|
||||
failure_derive = "0.1.1"
|
||||
failure = "~0.1"
|
||||
failure_derive = "~0.1"
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
[package]
|
||||
name = "mentat_sql"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[features]
|
||||
sqlcipher = ["rusqlite/sqlcipher"]
|
||||
|
||||
[dependencies]
|
||||
failure = "0.1"
|
||||
ordered-float = "1.0"
|
||||
failure = "~0.1"
|
||||
ordered-float = "~1.0"
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "0.23"
|
||||
version = "~0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
||||
[dependencies.core_traits]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "tolstoy_traits"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[lib]
|
||||
|
@ -11,16 +11,16 @@ path = "lib.rs"
|
|||
sqlcipher = ["rusqlite/sqlcipher"]
|
||||
|
||||
[dependencies]
|
||||
failure = "0.1"
|
||||
failure_derive = "0.1"
|
||||
http = "0.2"
|
||||
hyper = "0.13"
|
||||
serde_json = "1.0"
|
||||
uuid = { version = "0.8" }
|
||||
failure = "~0.1"
|
||||
failure_derive = "~0.1"
|
||||
http = "~0.2"
|
||||
hyper = "~0.13"
|
||||
serde_json = "~1.0"
|
||||
uuid = { version = "~0.8" }
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "~0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
||||
[dependencies.db_traits]
|
||||
path = "../db-traits"
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
edition = "2018"
|
||||
name = "mentat_tolstoy"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
authors = ["Grisha Kruglov <gkruglov@mozilla.com>"]
|
||||
|
||||
|
@ -9,21 +9,25 @@ authors = ["Grisha Kruglov <gkruglov@mozilla.com>"]
|
|||
sqlcipher = ["rusqlite/sqlcipher"]
|
||||
|
||||
[dependencies]
|
||||
failure = "0.1"
|
||||
futures = "0.3"
|
||||
hyper = "0.13"
|
||||
hyper-tls = "0.4"
|
||||
http = "0.2"
|
||||
log = "0.4"
|
||||
mime = "0.3"
|
||||
failure = "~0.1"
|
||||
futures = "~0.3"
|
||||
hyper = "~0.13"
|
||||
hyper-tls = "~0.4"
|
||||
http = "~0.2"
|
||||
log = "~0.4"
|
||||
mime = "~0.3"
|
||||
#tokio = { version = "0.2", features = ["full"] }
|
||||
tokio-core = "0.1"
|
||||
serde = "1.0"
|
||||
serde_json = "1.0"
|
||||
serde_cbor = "0.11"
|
||||
serde_derive = "1.0"
|
||||
lazy_static = "1.4"
|
||||
uuid = { version = "0.8", features = ["v4", "serde"] }
|
||||
tokio-core = "~0.1"
|
||||
serde = "~1.0"
|
||||
serde_json = "~1.0"
|
||||
serde_cbor = "~0.11"
|
||||
serde_derive = "~1.0"
|
||||
lazy_static = "~1.4"
|
||||
uuid = { version = "~0.8", features = ["v4", "serde"] }
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "~0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
||||
[dependencies.edn]
|
||||
path = "../edn"
|
||||
|
@ -49,7 +53,3 @@ path = "../public-traits"
|
|||
|
||||
[dependencies.mentat_transaction]
|
||||
path = "../transaction"
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "mentat_cli"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
|
||||
# Forward mentat's features.
|
||||
[features]
|
||||
|
@ -19,22 +19,22 @@ doc = false
|
|||
test = false
|
||||
|
||||
[dependencies]
|
||||
combine = "4.0"
|
||||
dirs = "2.0"
|
||||
env_logger = "0.7"
|
||||
failure = "0.1"
|
||||
failure_derive = "0.1"
|
||||
getopts = "0.2"
|
||||
lazy_static = "1.4"
|
||||
linefeed = "0.6"
|
||||
log = "0.4"
|
||||
tabwriter = "1"
|
||||
tempfile = "3.1"
|
||||
termion = "1.5"
|
||||
time = "0.2"
|
||||
combine = "~4.2"
|
||||
dirs = "~2.0"
|
||||
env_logger = "~0.7"
|
||||
failure = "~0.1"
|
||||
failure_derive = "~0.1"
|
||||
getopts = "~0.2"
|
||||
lazy_static = "~1.4"
|
||||
linefeed = "~0.6"
|
||||
log = "~0.4"
|
||||
tabwriter = "~1.2"
|
||||
tempfile = "~3.1"
|
||||
termion = "~1.5"
|
||||
time = "~0.2"
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "0.23"
|
||||
version = "~0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
||||
[dependencies.mentat]
|
||||
|
|
|
@ -1,13 +1,17 @@
|
|||
[package]
|
||||
name = "mentat_transaction"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
workspace = ".."
|
||||
|
||||
[features]
|
||||
sqlcipher = ["rusqlite/sqlcipher"]
|
||||
|
||||
[dependencies]
|
||||
failure = "0.1"
|
||||
failure = "~0.1"
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "~0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
||||
[dependencies.edn]
|
||||
path = "../edn"
|
||||
|
@ -41,7 +45,3 @@ path = "../query-pull"
|
|||
|
||||
[dependencies.mentat_query_sql]
|
||||
path = "../query-sql"
|
||||
|
||||
[dependencies.rusqlite]
|
||||
version = "0.23"
|
||||
features = ["limits", "bundled"]
|
||||
|
|
Loading…
Reference in a new issue