diff --git a/Cargo.lock b/Cargo.lock index 73912e1..b648c7a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,7 +11,7 @@ dependencies = [ "assert_fs", "clap", "crossbeam-channel", - "env_logger 0.9.1", + "env_logger 0.10.0", "log", "predicates", "serde", @@ -26,7 +26,7 @@ dependencies = [ "biodivine-lib-bdd", "crossbeam-channel", "derivative", - "env_logger 0.9.1", + "env_logger 0.10.0", "lexical-sort", "log", "nom", @@ -83,17 +83,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -102,9 +91,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "biodivine-lib-bdd" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "967934b40e38903f26498262995fd5c09b9470d8833590abd6a3de2b57c1a109" +checksum = "6788c9f2c86e8189b4f622f8c6e10febfef7fa66d796a09f6074f5339ba3bae3" dependencies = [ "fxhash", "num-bigint", @@ -154,9 +143,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.0.32" +version = "4.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" dependencies = [ "bitflags", "clap_derive", @@ -169,9 +158,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" dependencies = [ "heck", "proc-macro-error", @@ -250,12 +239,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -356,15 +345,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.2.6" @@ -423,7 +403,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "io-lifetimes", "rustix", "windows-sys", @@ -494,9 +474,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", diff --git a/bin/Cargo.toml b/bin/Cargo.toml index c7272a4..1475d6a 100644 --- a/bin/Cargo.toml +++ b/bin/Cargo.toml @@ -17,11 +17,11 @@ path = "src/main.rs" [dependencies] adf_bdd = { version="0.3.1", path="../lib", default-features = false } -clap = {version = "4.0.32", features = [ "derive", "cargo", "env" ]} +clap = {version = "4.1.4", features = [ "derive", "cargo", "env" ]} log = { version = "0.4", features = [ "max_level_trace", "release_max_level_info" ] } serde = { version = "1.0", features = ["derive","rc"] } serde_json = "1.0" -env_logger = "0.9" +env_logger = "0.10" strum = { version = "0.24" } crossbeam-channel = "0.5" diff --git a/bin/tests/cli.rs b/bin/tests/cli.rs index 82e85f7..d0b739b 100644 --- a/bin/tests/cli.rs +++ b/bin/tests/cli.rs @@ -14,7 +14,7 @@ fn arguments() -> Result<(), Box> { cmd = Command::cargo_bin("adf-bdd")?; cmd.arg("-v").arg("--lx").arg("--an").arg("file.txt"); cmd.assert().failure().stderr(predicate::str::contains( - "The argument '--lx' cannot be used with '--an'", + "argument '--lx' cannot be used with '--an'", )); cmd = Command::cargo_bin("adf-bdd")?; diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 2f36177..822aac7 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -24,11 +24,11 @@ crate-type = ["lib"] # The crate types to generate. [dependencies] log = { version = "0.4"} -nom = "7.1.1" +nom = "7.1.3" lexical-sort = "0.3.1" serde = { version = "1.0", features = ["derive","rc"] } serde_json = "1.0" -biodivine-lib-bdd = "0.4.1" +biodivine-lib-bdd = "0.4.2" derivative = "2.2.0" roaring = "0.10.1" strum = { version = "0.24", features = ["derive"] } @@ -37,7 +37,7 @@ rand = {version = "0.8.5", features = ["std_rng"]} [dev-dependencies] test-log = "0.2" -env_logger = "0.9" +env_logger = "0.10" quickcheck = "1" quickcheck_macros = "1"