diff --git a/Cargo.lock b/Cargo.lock index ce9e6d92c79c3..a539fc5380780 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3614,16 +3614,6 @@ dependencies = [ "ahash 0.8.2", ] -[[package]] -name = "hashlink" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0761a1b9491c4f2e3d66aa0f62d0fba0af9a0e2852e4d48ea506632a4b56e6aa" -dependencies = [ - "hashbrown 0.13.2", - "serde", -] - [[package]] name = "hdrhistogram" version = "7.5.2" @@ -9071,8 +9061,8 @@ dependencies = [ "directories 5.0.1", "dunce", "glob", - "hashlink", "hex", + "indexmap", "indicatif", "itertools", "log", diff --git a/vdev/Cargo.toml b/vdev/Cargo.toml index 23ab8ab123fda..aa10fea0f0266 100644 --- a/vdev/Cargo.toml +++ b/vdev/Cargo.toml @@ -20,8 +20,8 @@ directories = "5.0.1" # remove this when stabilized https://doc.rust-lang.org/stable/std/path/fn.absolute.html dunce = "1.0.4" glob = { version = "0.3.1", default-features = false } -hashlink = { version = "0.8.2", features = ["serde_impl"] } hex = "0.4.3" +indexmap = { version = "1.9", default-features = false, features = ["serde"] } indicatif = { version = "0.17.5", features = ["improved_unicode"] } itertools = "0.10.5" log = "0.4.18" diff --git a/vdev/src/testing/config.rs b/vdev/src/testing/config.rs index e7bedd7093805..560c7faba7b18 100644 --- a/vdev/src/testing/config.rs +++ b/vdev/src/testing/config.rs @@ -3,7 +3,7 @@ use std::path::{Path, PathBuf}; use std::{env, fs}; use anyhow::{bail, Context, Result}; -use hashlink::LinkedHashMap; +use indexmap::IndexMap; use itertools::{self, Itertools}; use serde::{Deserialize, Serialize}; use serde_yaml::Value; @@ -98,7 +98,7 @@ pub struct IntegrationTestConfig { #[serde(default)] pub env: Environment, /// The matrix of environment configurations values. - matrix: LinkedHashMap>, + matrix: IndexMap>, /// Configuration specific to the compose services. #[serde(default)] pub runner: IntegrationRunnerConfig, @@ -140,7 +140,7 @@ impl IntegrationTestConfig { Ok(config) } - pub fn environments(&self) -> LinkedHashMap { + pub fn environments(&self) -> IndexMap { self.matrix .values() .multi_cartesian_product()