pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xso: Apply clippy’s suggestions

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2024-07-24 21:24:15 +02:00 committed by pep
parent ca53892e66
commit 6e1f24c385
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xso/src/lib.rs
View file

@ -231,7 +231,7 @@ impl AsXmlText for &str {
impl<T: AsXmlText> AsXmlText for Box<T> { impl<T: AsXmlText> AsXmlText for Box<T> {
fn as_xml_text(&self) -> Result<Cow<'_, str>, self::error::Error> { fn as_xml_text(&self) -> Result<Cow<'_, str>, self::error::Error> {
T::as_xml_text(&*self) T::as_xml_text(self)
} }
} }

17
xso/src/rxml_util.rs
View file

@ -77,15 +77,13 @@ impl Item<'_> {
} }
/// Return an [`rxml::Item`], which borrows data from this item. /// Return an [`rxml::Item`], which borrows data from this item.
pub fn as_rxml_item<'x>(&'x self) -> rxml::Item<'x> { pub fn as_rxml_item(&self) -> rxml::Item<'_> {
match self { match self {
Self::XmlDeclaration(ref v) => rxml::Item::XmlDeclaration(*v), Self::XmlDeclaration(ref v) => rxml::Item::XmlDeclaration(*v),
Self::ElementHeadStart(ref ns, ref name) => rxml::Item::ElementHeadStart(ns, &**name), Self::ElementHeadStart(ref ns, ref name) => rxml::Item::ElementHeadStart(ns, name),
Self::Attribute(ref ns, ref name, ref value) => { Self::Attribute(ref ns, ref name, ref value) => rxml::Item::Attribute(ns, name, value),
rxml::Item::Attribute(ns, &**name, &**value)
}
Self::ElementHeadEnd => rxml::Item::ElementHeadEnd, Self::ElementHeadEnd => rxml::Item::ElementHeadEnd,
Self::Text(ref value) => rxml::Item::Text(&**value), Self::Text(ref value) => rxml::Item::Text(value),
Self::ElementFoot => rxml::Item::ElementFoot, Self::ElementFoot => rxml::Item::ElementFoot,
} }
} }
@ -185,7 +183,7 @@ impl<'x, I: Iterator<Item = Result<Item<'x>, crate::error::Error>>> ItemToEvent<
} }
impl<I> ItemToEvent<I> { impl<I> ItemToEvent<I> {
fn update<'x>(&mut self, item: Item<'x>) -> Result<Option<Event>, crate::error::Error> { fn update(&mut self, item: Item<'_>) -> Result<Option<Event>, crate::error::Error> {
assert!(self.event_buffer.is_none()); assert!(self.event_buffer.is_none());
match item { match item {
Item::XmlDeclaration(v) => { Item::XmlDeclaration(v) => {
@ -268,9 +266,8 @@ impl<'x, I: Iterator<Item = Result<Item<'x>, crate::error::Error>>> Iterator for
Some(Err(e)) => return Some(Err(e)), Some(Err(e)) => return Some(Err(e)),
None => return None, None => return None,
}; };
match self.update(item).transpose() { if let Some(v) = self.update(item).transpose() {
Some(v) => return Some(v), return Some(v);
None => (),
} }
} }
} }