mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radicle-cli/debug: Use `BTreeMap` for consistent ordering 

A `HashMap` does not guarantee a consistent iteration order. It is
desirable that all environment variables are printed in a consistent
order.

Use a `BTreeMap` which guarantees a consistent iteration order.
This commit is contained in:
Lorenz Leutgeb 2025-06-05 20:12:57 +02:00
parent 1df8cf102f
commit 727e4e72c7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/radicle-cli/src/commands/debug.rs
View File

@ -1,5 +1,5 @@
#![allow(clippy::or_fun_call)] #![allow(clippy::or_fun_call)]
use std::collections::HashMap; use std::collections::BTreeMap;
use std::env; use std::env;
use std::ffi::OsString; use std::ffi::OsString;
use std::path::PathBuf; use std::path::PathBuf;
@ -57,7 +57,7 @@ pub fn run(_options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
// Collect information about the local Radicle installation and write // Collect information about the local Radicle installation and write
// it out. // it out.
fn debug(profile: Option<&Profile>) -> anyhow::Result<()> { fn debug(profile: Option<&Profile>) -> anyhow::Result<()> {
let env = HashMap::from_iter(env::vars().filter_map(|(k, v)| { let env = BTreeMap::from_iter(env::vars().filter_map(|(k, v)| {
if k == "RAD_PASSPHRASE" { if k == "RAD_PASSPHRASE" {
Some((k, "<REDACTED>".into())) Some((k, "<REDACTED>".into()))
} else if k.starts_with("RAD_") || k.starts_with("SSH_") || k == "PATH" || k == "SHELL" { } else if k.starts_with("RAD_") || k.starts_with("SSH_") || k == "PATH" || k == "SHELL" {
@ -108,7 +108,7 @@ struct DebugInfo {
old_log: Option<LogFile>, old_log: Option<LogFile>,
operating_system: &'static str, operating_system: &'static str,
arch: &'static str, arch: &'static str,
env: HashMap<String, String>, env: BTreeMap<String, String>,
} }
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]