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

minidom: loosen type requirement on Element::attr{,_ns} getters

Browse source 
Signed-off-by: pep <pep@bouah.net>
This commit is contained in:
pep 2025-10-21 19:34:37 +02:00
commit 15ac51829f
5 changed files with 52 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

34
minidom/src/element.rs
View file

@ -26,10 +26,12 @@ use alloc::vec::Vec;
use core::slice;
use core::str::FromStr;
use std::borrow::Borrow;
use std::hash::Hash;
use std::io;
use rxml::writer::{Encoder, Item, TrackNamespace};
use rxml::{AttrMap, Namespace as RxmlNamespace, NcName, NcNameStr, RawReader, XmlVersion};
use rxml::{AttrMap, Namespace as RxmlNamespace, NcName, RawReader, XmlVersion};
fn encode_and_write<W: io::Write, T: rxml::writer::TrackNamespace>(
item: Item<'_>,
@ -188,8 +190,8 @@ impl Element {
///
/// assert_eq!(elem.name(), "name");
/// assert_eq!(elem.ns(), "namespace".to_owned());
/// assert_eq!(elem.attr(xml_ncname!("name")), Some("value"));
/// assert_eq!(elem.attr(xml_ncname!("inexistent")), None);
/// assert_eq!(elem.attr("name"), Some("value"));
/// assert_eq!(elem.attr("inexistent"), None);
/// assert_eq!(elem.text(), "inner");
/// ```
pub fn builder<S: AsRef<str>, NS: Into<String>>(name: S, namespace: NS) -> ElementBuilder {
@ -210,13 +212,13 @@ impl Element {
///
/// ```rust
/// use minidom::Element;
/// use rxml::{Namespace, xml_ncname};
/// use rxml::Namespace;
///
/// let bare = Element::bare("name", "namespace");
///
/// assert_eq!(bare.name(), "name");
/// assert_eq!(bare.ns(), "namespace");
/// assert_eq!(bare.attr(xml_ncname!("name")), None);
/// assert_eq!(bare.attr("name"), None);
/// assert_eq!(bare.text(), "");
/// ```
pub fn bare<S: Into<String>, NS: Into<String>>(name: S, namespace: NS) -> Element {
@ -243,7 +245,10 @@ impl Element {
/// Returns a reference to the value of the given attribute, if it exists, else `None`.
#[must_use]
pub fn attr<'a>(&'a self, name: &'a NcNameStr) -> Option<&'a str> {
pub fn attr<'a, N: Ord + Hash + Eq + ?Sized>(&'a self, name: &'a N) -> Option<&'a str>
where
NcName: Borrow<N>,
{
if let Some(value) = self.attributes.get(&RxmlNamespace::NONE, name) {
return Some(value);
}
@ -252,7 +257,15 @@ impl Element {
/// Returns a reference to the value of the given namespaced attribute, if it exists, else `None`.
#[must_use]
pub fn attr_ns<'a>(&'a self, ns: &'a RxmlNamespace, name: &'a NcNameStr) -> Option<&'a str> {
pub fn attr_ns<'a, NS: Ord + Hash + Eq + ?Sized, N: Ord + Hash + Eq + ?Sized>(
&'a self,
ns: &'a NS,
name: &'a N,
) -> Option<&'a str>
where
RxmlNamespace: Borrow<NS>,
NcName: Borrow<N>,
{
if let Some(value) = self.attributes.get(ns, name) {
return Some(value);
}
@ -953,11 +966,8 @@ mod tests {
assert_eq!(elem.name(), "name");
assert_eq!(elem.ns(), "namespace".to_owned());
assert_eq!(
elem.attr_ns(&String::from("namespace").into(), xml_ncname!("name")),
Some("value")
);
assert_eq!(elem.attr(xml_ncname!("inexistent")), None);
assert_eq!(elem.attr_ns("namespace", "name"), Some("value"));
assert_eq!(elem.attr("inexistent"), None);
}
#[test]

19
minidom/src/tests.rs
View file

@ -281,8 +281,8 @@ fn builder_works() {
.build();
assert_eq!(elem.name(), "a");
assert_eq!(elem.ns(), "b".to_owned());
assert_eq!(elem.attr(xml_ncname!("c")), Some("d"));
assert_eq!(elem.attr(xml_ncname!("x")), None);
assert_eq!(elem.attr("c"), Some("d"));
assert_eq!(elem.attr("x"), None);
assert_eq!(elem.text(), "e");
assert!(elem.has_child("child", "b"));
assert!(elem.is("a", "b"));
@ -311,15 +311,11 @@ fn get_child_works() {
.unwrap()
.is("child", "child_ns"));
assert_eq!(
root.get_child("child", "root_ns")
.unwrap()
.attr(xml_ncname!("c")),
root.get_child("child", "root_ns").unwrap().attr("c"),
Some("d")
);
assert_eq!(
root.get_child("child", "child_ns")
.unwrap()
.attr(xml_ncname!("d")),
root.get_child("child", "child_ns").unwrap().attr("d"),
Some("e")
);
}
@ -357,15 +353,12 @@ fn two_elements_with_same_arguments_different_order_are_equal() {
#[test]
fn namespace_attributes_works() {
let root = Element::from_reader(TEST_STRING).unwrap();
assert_eq!(
Some("en"),
root.attr_ns(RxmlNamespace::xml(), xml_ncname!("lang"))
);
assert_eq!(Some("en"), root.attr_ns(RxmlNamespace::xml(), "lang"));
assert_eq!(
"fr",
root.get_child("child", "child_ns")
.unwrap()
.attr_ns(RxmlNamespace::xml(), xml_ncname!("lang"))
.attr_ns(RxmlNamespace::xml(), "lang")
.unwrap()
);
}