From efe8866887509fa7db385bc01fce8fad140d88b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Turi?= <43903075+Yirmandias@users.noreply.github.com> Date: Fri, 1 Sep 2023 17:16:03 +0200 Subject: [PATCH] fix(deps): Fix compiling bug with itertools (#101) * fix compiling bug with itertools * define itertools in workspace --- Cargo.lock | 21 +++++++++++++++------ Cargo.toml | 1 + cp/collections/Cargo.toml | 2 +- cp/solver/Cargo.toml | 2 +- cp/utils/Cargo.toml | 2 +- examples/scheduling/Cargo.toml | 2 +- examples/smt/Cargo.toml | 2 +- planning/grpc/api/Cargo.toml | 2 +- planning/grpc/server/Cargo.toml | 2 +- planning/planning/Cargo.toml | 2 +- solver/Cargo.toml | 2 +- 11 files changed, 25 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 72fe9dea..d483914a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -42,7 +42,7 @@ dependencies = [ "bit-set", "crossbeam-channel", "env_param", - "itertools 0.10.5", + "itertools 0.11.0", "lazy_static", "lru", "num-integer", @@ -78,7 +78,7 @@ dependencies = [ "fixedbitset", "futures-core", "futures-util", - "itertools 0.10.5", + "itertools 0.11.0", "num-rational", "prost", "rand 0.8.5", @@ -135,7 +135,7 @@ dependencies = [ "aries", "env_param", "fixedbitset", - "itertools 0.10.5", + "itertools 0.11.0", "regex", "streaming-iterator", ] @@ -158,7 +158,7 @@ version = "0.1.0" dependencies = [ "anyhow", "aries", - "itertools 0.10.5", + "itertools 0.11.0", "structopt", "walkdir", ] @@ -168,7 +168,7 @@ name = "aries_smt" version = "0.1.0" dependencies = [ "aries", - "itertools 0.10.5", + "itertools 0.11.0", ] [[package]] @@ -804,6 +804,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.8" @@ -1776,7 +1785,7 @@ name = "unified_planning" version = "0.1.0" dependencies = [ "async-trait", - "itertools 0.10.5", + "itertools 0.11.0", "prost", "regex", "tonic", diff --git a/Cargo.toml b/Cargo.toml index e8b98115..c5d4515d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,6 +20,7 @@ anyhow = { version = "1.0"} clap = {version = "4.0", features = ["derive"]} tracing = { version = "0.1", features = ["release_max_level_debug"] } tracing-subscriber = "0.3" +itertools = { version = "0.11.0" } [profile.dev] opt-level = 0 diff --git a/cp/collections/Cargo.toml b/cp/collections/Cargo.toml index 381c9a76..fd7a2d32 100644 --- a/cp/collections/Cargo.toml +++ b/cp/collections/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] vec_map = "0.8.1" -itertools = { default-features = false, version = "0.10" } +itertools = { workspace = true } bit-set = { default-features = false, version = "0.5.2" } diff --git a/cp/solver/Cargo.toml b/cp/solver/Cargo.toml index ef203767..775dfde4 100644 --- a/cp/solver/Cargo.toml +++ b/cp/solver/Cargo.toml @@ -21,6 +21,6 @@ aries_core = { path = "../core" } aries_model = { path = "../model" } crossbeam-channel = "0.5" env_param = { path = "../../env_param" } -itertools = { version = "0.10" } +itertools = { workspace = true } num-traits = { default-features = false, version = "0.2.14" } diff --git a/cp/utils/Cargo.toml b/cp/utils/Cargo.toml index f95d7207..cf9fa191 100644 --- a/cp/utils/Cargo.toml +++ b/cp/utils/Cargo.toml @@ -8,4 +8,4 @@ edition = "2018" [dependencies] streaming-iterator = "0.1.5" -itertools = { default-features = false, version = "0.10.0" } +itertools = { workspace = true } diff --git a/examples/scheduling/Cargo.toml b/examples/scheduling/Cargo.toml index d076852a..3655d6ab 100644 --- a/examples/scheduling/Cargo.toml +++ b/examples/scheduling/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Arthur Bit-Monnot "] edition = "2021" [dependencies] -itertools = "0.10" +itertools = { workspace = true } structopt = "0.3" anyhow = { workspace = true } aries = { path = "../../solver", features = ["cpu_cycles"] } diff --git a/examples/smt/Cargo.toml b/examples/smt/Cargo.toml index 2d0801c7..40f33a81 100644 --- a/examples/smt/Cargo.toml +++ b/examples/smt/Cargo.toml @@ -6,4 +6,4 @@ edition = "2018" [dependencies] aries = { path = "../../solver" } -itertools = { version = "0.10" } +itertools = { workspace = true } diff --git a/planning/grpc/api/Cargo.toml b/planning/grpc/api/Cargo.toml index a020b969..f5cc5404 100644 --- a/planning/grpc/api/Cargo.toml +++ b/planning/grpc/api/Cargo.toml @@ -10,7 +10,7 @@ async-trait = "0.1" prost = {default-features = false, version = "0.11"} regex = {features = ["std"], default-features = false, version = "1"} tonic = "0.8" -itertools = "0.10" +itertools = { workspace = true } [build-dependencies] tonic-build = {version = "0.8", optional = true} diff --git a/planning/grpc/server/Cargo.toml b/planning/grpc/server/Cargo.toml index ab2f9379..12a20949 100644 --- a/planning/grpc/server/Cargo.toml +++ b/planning/grpc/server/Cargo.toml @@ -15,7 +15,7 @@ clap = { workspace = true } fixedbitset = { default-features = false, version = "0.4" } futures-core = { default-features = false, version = "0.3" } futures-util = { default-features = false, version = "0.3" } -itertools = { default-features = false, version = "0.10" } +itertools = { workspace = true } num-rational = { default-features = false, version = "0.4" } prost = { default-features = false, version = "0.11" } regex = { default-features = false, version = "1" } diff --git a/planning/planning/Cargo.toml b/planning/planning/Cargo.toml index 6ee077fe..5f1b3fc9 100644 --- a/planning/planning/Cargo.toml +++ b/planning/planning/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] anyhow = { workspace = true } fixedbitset = { default-features = false, version = "0.4" } -itertools = { default-features = false, version = "0.10" } +itertools = { workspace = true } streaming-iterator = "0.1.5" regex = { features = ["std"], default-features = false, version = "1" } aries = { path = "../../solver" } diff --git a/solver/Cargo.toml b/solver/Cargo.toml index 6dda0d70..8890e123 100644 --- a/solver/Cargo.toml +++ b/solver/Cargo.toml @@ -21,7 +21,7 @@ anyhow = { workspace = true } streaming-iterator = "0.1.5" lazy_static = "1.4.0" vec_map = "0.8.1" -itertools = { default-features = false, version = "0.10" } +itertools = { workspace = true } bit-set = { default-features = false, version = "0.5.2" } crossbeam-channel = "0.5" env_param = { path = "../env_param" }