From 3a41aedda9dd682abf47b9ff50a31478f79ff485 Mon Sep 17 00:00:00 2001
From: bokuweb <bokuweb12@gmail.com>
Date: Fri, 12 Jul 2024 12:10:42 +0900
Subject: [PATCH] fix: use btree set (#739)

---
 docx-core/src/reader/document_rels.rs         | 4 ++--
 docx-core/src/reader/header_or_footer_rels.rs | 4 ++--
 docx-core/src/reader/rels.rs                  | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docx-core/src/reader/document_rels.rs b/docx-core/src/reader/document_rels.rs
index 2df9726..233e140 100644
--- a/docx-core/src/reader/document_rels.rs
+++ b/docx-core/src/reader/document_rels.rs
@@ -1,5 +1,5 @@
 use std::collections::BTreeMap;
-use std::collections::HashSet;
+use std::collections::BTreeSet;
 use std::io::Cursor;
 use std::path::*;
 
@@ -13,7 +13,7 @@ pub type RId = String;
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct ReadDocumentRels {
-    rels: BTreeMap<String, HashSet<(RId, PathBuf, Option<String>)>>,
+    rels: BTreeMap<String, BTreeSet<(RId, PathBuf, Option<String>)>>,
 }
 
 impl ReadDocumentRels {
diff --git a/docx-core/src/reader/header_or_footer_rels.rs b/docx-core/src/reader/header_or_footer_rels.rs
index 4bc1209..25ef785 100644
--- a/docx-core/src/reader/header_or_footer_rels.rs
+++ b/docx-core/src/reader/header_or_footer_rels.rs
@@ -1,5 +1,5 @@
 use std::collections::BTreeMap;
-use std::collections::HashSet;
+use std::collections::BTreeSet;
 use std::io::Cursor;
 use std::path::*;
 
@@ -14,7 +14,7 @@ pub type RId = String;
 
 #[derive(Debug, Clone, PartialEq, Default)]
 pub struct ReadHeaderOrFooterRels {
-    pub rels: BTreeMap<String, HashSet<(RId, PathBuf, Option<String>)>>,
+    pub rels: BTreeMap<String, BTreeSet<(RId, PathBuf, Option<String>)>>,
 }
 
 impl ReadHeaderOrFooterRels {
diff --git a/docx-core/src/reader/rels.rs b/docx-core/src/reader/rels.rs
index de5ac21..febed96 100644
--- a/docx-core/src/reader/rels.rs
+++ b/docx-core/src/reader/rels.rs
@@ -2,13 +2,13 @@ use super::*;
 use crate::reader::{FromXML, ReaderError};
 use std::str::FromStr;
 use std::{
-    collections::{BTreeMap, HashSet},
+    collections::{BTreeMap, BTreeSet},
     io::Read,
     path::{Path, PathBuf},
 };
 use xml::reader::{EventReader, XmlEvent};
 
-pub type ReadRels = BTreeMap<String, HashSet<(RId, PathBuf, Option<String>)>>;
+pub type ReadRels = BTreeMap<String, BTreeSet<(RId, PathBuf, Option<String>)>>;
 
 impl FromXML for Rels {
     fn from_xml<R: Read>(reader: R) -> Result<Self, ReaderError> {
@@ -60,7 +60,7 @@ pub fn find_rels_filename(main_path: impl AsRef<Path>) -> Result<PathBuf, Reader
 
 pub fn read_rels_xml<R: Read>(reader: R, dir: impl AsRef<Path>) -> Result<ReadRels, ReaderError> {
     let mut parser = EventReader::new(reader);
-    let mut rels: BTreeMap<String, HashSet<(RId, PathBuf, Option<String>)>> = BTreeMap::new();
+    let mut rels: BTreeMap<String, BTreeSet<(RId, PathBuf, Option<String>)>> = BTreeMap::new();
 
     loop {
         let e = parser.next();
@@ -99,7 +99,7 @@ pub fn read_rels_xml<R: Read>(reader: R, dir: impl AsRef<Path>) -> Result<ReadRe
                         paths.insert((rid, target, target_mode));
                         rels.insert(rel_type, paths);
                     } else {
-                        let s: HashSet<(RId, PathBuf, Option<String>)> =
+                        let s: BTreeSet<(RId, PathBuf, Option<String>)> =
                             vec![(rid, target, target_mode)].into_iter().collect();
                         rels.insert(rel_type, s);
                     }