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)>>, + rels: BTreeMap)>>, } 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)>>, + pub rels: BTreeMap)>>, } 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)>>; +pub type ReadRels = BTreeMap)>>; impl FromXML for Rels { fn from_xml(reader: R) -> Result { @@ -60,7 +60,7 @@ pub fn find_rels_filename(main_path: impl AsRef) -> Result(reader: R, dir: impl AsRef) -> Result { let mut parser = EventReader::new(reader); - let mut rels: BTreeMap)>> = BTreeMap::new(); + let mut rels: BTreeMap)>> = BTreeMap::new(); loop { let e = parser.next(); @@ -99,7 +99,7 @@ pub fn read_rels_xml(reader: R, dir: impl AsRef) -> Result)> = + let s: BTreeSet<(RId, PathBuf, Option)> = vec![(rid, target, target_mode)].into_iter().collect(); rels.insert(rel_type, s); }