Issue buckyos#256: Stable sort for HashSet

streetycat · May 12, 2023 · b5e461b · b5e461b
1 parent 0ab7ca7
commit b5e461b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/component/cyfs-base/src/codec/raw/raw_types.rs b/src/component/cyfs-base/src/codec/raw/raw_types.rs
@@ -740,7 +740,7 @@ impl<'de, T: RawEncode + RawDecode<'de>> RawDecode<'de> for Vec<T> {
 
 // HashSet<T>
 
-impl<T: RawEncode> RawEncode for HashSet<T> {
+impl<T: RawEncode + std::cmp::Ord> RawEncode for HashSet<T> {
     fn raw_measure(&self, purpose: &Option<RawEncodePurpose>) -> BuckyResult<usize> {
         let ulen = USize(self.len());
         let mut bytes = ulen.raw_measure(purpose).unwrap();
@@ -757,13 +757,17 @@ impl<T: RawEncode> RawEncode for HashSet<T> {
     ) -> BuckyResult<&'a mut [u8]> {
         let ulen = USize(self.len());
         let mut buf = ulen.raw_encode(buf, purpose)?;
-        for e in self {
+
+        // stable sort
+        let mut values: Vec<&T> = self.iter().collect();
+        values.sort();
+
+        for e in values {
             buf = e.raw_encode(buf, purpose)?;
         }
         Ok(buf)
     }
 }
-
 impl<'de, T: Eq + Hash + RawEncode + RawDecode<'de>> RawDecode<'de> for HashSet<T> {
     fn raw_decode(buf: &'de [u8]) -> BuckyResult<(Self, &'de [u8])> {
         let (ulen, mut buf) = USize::raw_decode(buf)?;