mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
cca1e0ba1d
## Summary - Bump the workspace Rust toolchain from `1.93.0` to `1.95.0` across Cargo, Bazel, CI, release workflows, devcontainers, and the Codex environment config. - Refresh `MODULE.bazel.lock` so the Bazel Rust toolchain artifacts match the new version. - Leave purpose-specific toolchains unchanged, including the `argument-comment-lint` nightly and the upstream `rusty_v8` `1.91.0` build pin. - Includes fixes for new lints from `just fix` and a few codex-authored fixes for lints without a suggestion.
73 lines
1.8 KiB
Rust
73 lines
1.8 KiB
Rust
use std::collections::HashMap;
|
|
|
|
pub fn format_env_display<S: AsRef<str>>(
|
|
env: Option<&HashMap<String, String>>,
|
|
env_vars: &[S],
|
|
) -> String {
|
|
let mut parts: Vec<String> = Vec::new();
|
|
|
|
if let Some(map) = env {
|
|
let mut pairs: Vec<_> = map.iter().collect();
|
|
pairs.sort_by_key(|(key, _)| *key);
|
|
parts.extend(pairs.into_iter().map(|(key, _)| format!("{key}=*****")));
|
|
}
|
|
|
|
if !env_vars.is_empty() {
|
|
parts.extend(env_vars.iter().map(|var| format!("{}=*****", var.as_ref())));
|
|
}
|
|
|
|
if parts.is_empty() {
|
|
"-".to_string()
|
|
} else {
|
|
parts.join(", ")
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn returns_dash_when_empty() {
|
|
let empty_vars: &[String] = &[];
|
|
assert_eq!(format_env_display(/*env*/ None, empty_vars), "-");
|
|
|
|
let empty_map = HashMap::new();
|
|
assert_eq!(format_env_display(Some(&empty_map), empty_vars), "-");
|
|
}
|
|
|
|
#[test]
|
|
fn formats_sorted_env_pairs() {
|
|
let mut env = HashMap::new();
|
|
env.insert("B".to_string(), "two".to_string());
|
|
env.insert("A".to_string(), "one".to_string());
|
|
|
|
assert_eq!(
|
|
format_env_display(Some(&env), &[] as &[String]),
|
|
"A=*****, B=*****"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn formats_env_vars_with_dollar_prefix() {
|
|
let vars = vec!["TOKEN".to_string(), "PATH".to_string()];
|
|
|
|
assert_eq!(
|
|
format_env_display(/*env*/ None, &vars),
|
|
"TOKEN=*****, PATH=*****"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn combines_env_pairs_and_vars() {
|
|
let mut env = HashMap::new();
|
|
env.insert("HOME".to_string(), "/tmp".to_string());
|
|
let vars = vec!["TOKEN".to_string()];
|
|
|
|
assert_eq!(
|
|
format_env_display(Some(&env), &vars),
|
|
"HOME=*****, TOKEN=*****"
|
|
);
|
|
}
|
|
}
|