treewide: replace std hashers with rustc_hash alternatives; fix clippy
Signed-off-by: NotAShelf <raf@notashelf.dev> Change-Id: I766c36cb53d3d7f9e85b91a67c4131a66a6a6964
This commit is contained in:
parent
0e79ba0518
commit
c6efd3661f
53 changed files with 343 additions and 394 deletions
|
|
@ -1494,6 +1494,8 @@ impl Default for Config {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use rustc_hash::FxHashMap;
|
||||
|
||||
use super::*;
|
||||
|
||||
fn test_config_with_concurrency(concurrency: usize) -> Config {
|
||||
|
|
@ -1549,7 +1551,7 @@ mod tests {
|
|||
// HashMap lookup. This avoids unsafe std::env::set_var and is
|
||||
// thread-safe for parallel test execution.
|
||||
fn test_lookup<'a>(
|
||||
vars: &'a std::collections::HashMap<&str, &str>,
|
||||
vars: &'a FxHashMap<&str, &str>,
|
||||
) -> impl Fn(&str) -> crate::error::Result<String> + 'a {
|
||||
move |name| {
|
||||
vars
|
||||
|
|
@ -1565,24 +1567,21 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_expand_env_var_simple() {
|
||||
let vars =
|
||||
std::collections::HashMap::from([("TEST_VAR_SIMPLE", "test_value")]);
|
||||
let vars = FxHashMap::from([("TEST_VAR_SIMPLE", "test_value")]);
|
||||
let result = expand_env_vars("$TEST_VAR_SIMPLE", test_lookup(&vars));
|
||||
assert_eq!(result.unwrap(), "test_value");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_expand_env_var_braces() {
|
||||
let vars =
|
||||
std::collections::HashMap::from([("TEST_VAR_BRACES", "test_value")]);
|
||||
let vars = FxHashMap::from([("TEST_VAR_BRACES", "test_value")]);
|
||||
let result = expand_env_vars("${TEST_VAR_BRACES}", test_lookup(&vars));
|
||||
assert_eq!(result.unwrap(), "test_value");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_expand_env_var_embedded() {
|
||||
let vars =
|
||||
std::collections::HashMap::from([("TEST_VAR_EMBEDDED", "value")]);
|
||||
let vars = FxHashMap::from([("TEST_VAR_EMBEDDED", "value")]);
|
||||
let result =
|
||||
expand_env_vars("prefix_${TEST_VAR_EMBEDDED}_suffix", test_lookup(&vars));
|
||||
assert_eq!(result.unwrap(), "prefix_value_suffix");
|
||||
|
|
@ -1590,15 +1589,14 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_expand_env_var_multiple() {
|
||||
let vars =
|
||||
std::collections::HashMap::from([("VAR1", "value1"), ("VAR2", "value2")]);
|
||||
let vars = FxHashMap::from([("VAR1", "value1"), ("VAR2", "value2")]);
|
||||
let result = expand_env_vars("${VAR1}_${VAR2}", test_lookup(&vars));
|
||||
assert_eq!(result.unwrap(), "value1_value2");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_expand_env_var_missing() {
|
||||
let vars = std::collections::HashMap::new();
|
||||
let vars = FxHashMap::default();
|
||||
let result = expand_env_vars("${NONEXISTENT_VAR}", test_lookup(&vars));
|
||||
assert!(result.is_err());
|
||||
assert!(
|
||||
|
|
@ -1611,7 +1609,7 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_expand_env_var_empty_name() {
|
||||
let vars = std::collections::HashMap::new();
|
||||
let vars = FxHashMap::default();
|
||||
let result = expand_env_vars("${}", test_lookup(&vars));
|
||||
assert!(result.is_err());
|
||||
assert!(
|
||||
|
|
@ -1624,31 +1622,28 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_expand_env_var_escaped() {
|
||||
let vars = std::collections::HashMap::new();
|
||||
let vars = FxHashMap::default();
|
||||
let result = expand_env_vars("\\$NOT_A_VAR", test_lookup(&vars));
|
||||
assert_eq!(result.unwrap(), "$NOT_A_VAR");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_expand_env_var_no_vars() {
|
||||
let vars = std::collections::HashMap::new();
|
||||
let vars = FxHashMap::default();
|
||||
let result = expand_env_vars("plain_text", test_lookup(&vars));
|
||||
assert_eq!(result.unwrap(), "plain_text");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_expand_env_var_underscore() {
|
||||
let vars = std::collections::HashMap::from([("TEST_VAR_NAME", "value")]);
|
||||
let vars = FxHashMap::from([("TEST_VAR_NAME", "value")]);
|
||||
let result = expand_env_vars("$TEST_VAR_NAME", test_lookup(&vars));
|
||||
assert_eq!(result.unwrap(), "value");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_expand_env_var_mixed_syntax() {
|
||||
let vars = std::collections::HashMap::from([
|
||||
("VAR1_MIXED", "v1"),
|
||||
("VAR2_MIXED", "v2"),
|
||||
]);
|
||||
let vars = FxHashMap::from([("VAR1_MIXED", "v1"), ("VAR2_MIXED", "v2")]);
|
||||
let result =
|
||||
expand_env_vars("$VAR1_MIXED and ${VAR2_MIXED}", test_lookup(&vars));
|
||||
assert_eq!(result.unwrap(), "v1 and v2");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue