wynd
/
docx-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use btree set (#739)

main
bokuweb 2024-07-12 12:10:42 +09:00 committed by GitHub
parent 77b9ca3fca
commit 3a41aedda9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docx-core/src/reader/document_rels.rs
View File

@ -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 {

4
docx-core/src/reader/header_or_footer_rels.rs
View File

@ -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 {

8
docx-core/src/reader/rels.rs
View File

@ -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);
}