xso: Apply clippy’s suggestions

Emmanuel Gil Peyrot created 2 years ago

Change summary

xso/src/lib.rs       |  2 +-
xso/src/rxml_util.rs | 17 +++++++----------
2 files changed, 8 insertions(+), 11 deletions(-)

Detailed changes

xso/src/lib.rs

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

xso/src/rxml_util.rs

@@ -77,15 +77,13 @@ impl 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 {
             Self::XmlDeclaration(ref v) => rxml::Item::XmlDeclaration(*v),
-            Self::ElementHeadStart(ref ns, ref name) => rxml::Item::ElementHeadStart(ns, &**name),
-            Self::Attribute(ref ns, ref name, ref value) => {
-                rxml::Item::Attribute(ns, &**name, &**value)
-            }
+            Self::ElementHeadStart(ref ns, ref name) => rxml::Item::ElementHeadStart(ns, name),
+            Self::Attribute(ref ns, ref name, ref value) => rxml::Item::Attribute(ns, name, value),
             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,
         }
     }
@@ -185,7 +183,7 @@ impl<'x, I: Iterator<Item = Result<Item<'x>, crate::error::Error>>> ItemToEvent<
 }
 
 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());
         match item {
             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)),
                 None => return None,
             };
-            match self.update(item).transpose() {
-                Some(v) => return Some(v),
-                None => (),
+            if let Some(v) = self.update(item).transpose() {
+                return Some(v);
             }
         }
     }