tracer: use BTreeMap to make env sorted

kxxt · May 5, 2024 · 8243758 · 8243758
1 parent 66f98ce
commit 8243758
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/printer.rs b/src/printer.rs
@@ -1,6 +1,6 @@
 use std::{
   cell::RefCell,
-  collections::HashMap,
+  collections::BTreeMap,
   ffi::OsStr,
   io::{self, Write},
   path::Path,
@@ -357,7 +357,7 @@ impl Printer {
     &self,
     state: &ProcessState,
     result: i64,
-    env: &HashMap<String, String>,
+    env: &BTreeMap<String, String>,
     cwd: &Path,
   ) -> color_eyre::Result<()> {
     // Preconditions:

diff --git a/src/proc.rs b/src/proc.rs
@@ -3,7 +3,7 @@
 use core::fmt;
 use std::{
   borrow::Cow,
-  collections::{BTreeMap, HashMap, HashSet},
+  collections::{BTreeMap, BTreeSet, HashSet},
   ffi::CString,
   fmt::{Display, Formatter},
   io::{self, BufRead, BufReader, Read},
@@ -290,9 +290,9 @@ pub fn parse_env_entry(item: &str) -> (&str, &str) {
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct EnvDiff {
-  pub added: HashMap<String, String>,
-  pub removed: HashSet<String>,
-  pub modified: HashMap<String, String>,
+  pub added: BTreeMap<String, String>,
+  pub removed: BTreeSet<String>,
+  pub modified: BTreeMap<String, String>,
 }
 
 impl EnvDiff {
@@ -301,9 +301,9 @@ impl EnvDiff {
   }
 }
 
-pub fn diff_env(original: &HashMap<String, String>, envp: &[String]) -> EnvDiff {
-  let mut added = HashMap::new();
-  let mut modified = HashMap::new();
+pub fn diff_env(original: &BTreeMap<String, String>, envp: &[String]) -> EnvDiff {
+  let mut added = BTreeMap::new();
+  let mut modified = BTreeMap::new();
   // Use str to avoid cloning all env vars
   let mut removed: HashSet<&str> = original.keys().map(|v| v.as_str()).collect();
   for entry in envp.iter() {
@@ -329,7 +329,7 @@ pub fn diff_env(original: &HashMap<String, String>, envp: &[String]) -> EnvDiff
 #[derive(Debug, Clone)]
 pub struct BaselineInfo {
   pub cwd: PathBuf,
-  pub env: HashMap<String, String>,
+  pub env: BTreeMap<String, String>,
   pub fdinfo: FileDescriptorInfoCollection,
 }
 

diff --git a/src/tracer.rs b/src/tracer.rs
@@ -1,5 +1,5 @@
 use std::{
-  collections::HashMap,
+  collections::BTreeMap,
   ffi::CString,
   io::{self, stdin},
   os::fd::AsRawFd,
@@ -724,7 +724,7 @@ impl Tracer {
 
   // This function does not take self due to borrow checker
   fn collect_exec_event(
-    env: &HashMap<String, String>,
+    env: &BTreeMap<String, String>,
     state: &ProcessState,
     result: i64,
   ) -> Box<ExecEvent> {