Revert to Btree

src/lookup/file_mounts.rs

@@ -20,8 +20,8 @@ use crate::data::paths::PathDeconstruction;
 use crate::library::results::{HttmError, HttmResult};
 use crate::lookup::versions::ProximateDatasetAndOptAlts;
 use crate::GLOBAL_CONFIG;
-use hashbrown::HashSet;
 use rayon::prelude::*;
+use std::collections::BTreeSet;
 use std::ops::Deref;
 use std::path::PathBuf;
 
@@ -50,12 +50,12 @@ impl MountDisplay {
 
 #[derive(Debug)]
 pub struct MountsForFiles<'a> {
-    inner: HashSet<ProximateDatasetAndOptAlts<'a>>,
+    inner: BTreeSet<ProximateDatasetAndOptAlts<'a>>,
     mount_display: &'a MountDisplay,
 }
 
 impl<'a> Deref for MountsForFiles<'a> {
-    type Target = HashSet<ProximateDatasetAndOptAlts<'a>>;
+    type Target = BTreeSet<ProximateDatasetAndOptAlts<'a>>;
 
     fn deref(&self) -> &Self::Target {
         &self.inner
@@ -70,7 +70,7 @@ impl<'a> MountsForFiles<'a> {
     pub fn new(mount_display: &'a MountDisplay) -> HttmResult<Self> {
         // we only check for phantom files in "mount for file" mode because
         // people should be able to search for deleted files in other modes
-        let set: HashSet<ProximateDatasetAndOptAlts> = GLOBAL_CONFIG
+        let set: BTreeSet<ProximateDatasetAndOptAlts> = GLOBAL_CONFIG
             .paths
             .par_iter()
             .filter_map(|pd| match ProximateDatasetAndOptAlts::new(pd) {

src/lookup/versions.rs

@@ -167,6 +167,20 @@ pub struct ProximateDatasetAndOptAlts<'a> {
     pub opt_alts: Option<&'a Vec<PathBuf>>,
 }
 
+impl<'a> Ord for ProximateDatasetAndOptAlts<'a> {
+    #[inline]
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.pathdata.cmp(&other.pathdata)
+    }
+}
+
+impl<'a> PartialOrd for ProximateDatasetAndOptAlts<'a> {
+    #[inline]
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
 impl<'a> ProximateDatasetAndOptAlts<'a> {
     pub fn new(pathdata: &'a PathData) -> HttmResult<Self> {
         // here, we take our file path and get back possibly multiple ZFS dataset mountpoints