xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minidom: Rework Prefixes internal structure

Browse source 
Change the mapping in Prefixes to Prefix -> Namespace instead of
Namespace -> Prefix. This allows us to not have duplicate prefixes
anymore, but requires us to store the prefix on Element. This prefix is
only taken as a hint anyway and used only when coming from the reader.

This commits also partially removes the possibility to add prefixes
when creating an Element via `Element::new`, `Element::builder` or
`Element::bare`. Proper errors should be added in the following commits.

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2020-03-29 18:32:16 +02:00
commit 1f2d7aa99d
4 changed files with 106 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

4
minidom-rs/src/tests.rs
View file

@ -145,7 +145,7 @@ fn writer_with_prefix() {
.prefix(None, "ns2")
.build();
assert_eq!(String::from(&root),
r#"<p1:root xmlns:p1="ns1" xmlns="ns2"/>"#,
r#"<p1:root xmlns="ns2" xmlns:p1="ns1"/>"#,
);
}
@ -198,7 +198,7 @@ fn writer_with_prefix_deduplicate() {
.append(child)
.build();
assert_eq!(String::from(&root),
r#"<p1:root xmlns:p1="ns1" xmlns="ns2"><p1:child/></p1:root>"#,
r#"<p1:root xmlns="ns2" xmlns:p1="ns1"><p1:child/></p1:root>"#,
);
// Ensure descendants don't just reuse ancestors' prefixes that have been shadowed in between