From 4768d092cafdd4ecee62b6430142ec0efc2f6739 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Tue, 29 Nov 2022 16:04:24 +0100 Subject: [PATCH] Apply clippy suggestions --- instant-xml-macros/src/lib.rs | 2 +- instant-xml/src/de.rs | 8 ++++---- instant-xml/src/impls.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/instant-xml-macros/src/lib.rs b/instant-xml-macros/src/lib.rs index e4f972e..0986854 100644 --- a/instant-xml-macros/src/lib.rs +++ b/instant-xml-macros/src/lib.rs @@ -74,7 +74,7 @@ impl<'input> ContainerMeta<'input> { }) } - fn xml_generics<'a>(&self, borrowed: BTreeSet) -> Generics { + fn xml_generics(&self, borrowed: BTreeSet) -> Generics { let mut xml_generics = self.input.generics.clone(); let mut xml = syn::LifetimeDef::new(syn::Lifetime::new("'xml", Span::call_site())); xml.bounds.extend(borrowed.into_iter()); diff --git a/instant-xml/src/de.rs b/instant-xml/src/de.rs index 3481b79..181b6d9 100644 --- a/instant-xml/src/de.rs +++ b/instant-xml/src/de.rs @@ -34,9 +34,9 @@ impl<'cx, 'xml> Deserializer<'cx, 'xml> { match self.next() { Some(Ok(Node::AttributeValue(s))) => Ok(s), Some(Ok(Node::Text(s))) => Ok(s), - Some(Ok(node)) => return Err(Error::ExpectedScalar(format!("{node:?}"))), - Some(Err(e)) => return Err(e), - None => return Err(Error::MissingValue(&Kind::Scalar)), + Some(Ok(node)) => Err(Error::ExpectedScalar(format!("{node:?}"))), + Some(Err(e)) => Err(e), + None => Err(Error::MissingValue(&Kind::Scalar)), } } @@ -137,7 +137,7 @@ impl<'xml> Context<'xml> { Ok(Id { ns: match (element.default_ns, element.prefix) { (_, Some(prefix)) => match element.level.prefixes.get(prefix) { - Some(ns) => *ns, + Some(ns) => ns, None => match self.lookup(prefix) { Some(ns) => ns, None => return Err(Error::UnknownPrefix(prefix.to_owned())), diff --git a/instant-xml/src/impls.rs b/instant-xml/src/impls.rs index 32031eb..6f86422 100644 --- a/instant-xml/src/impls.rs +++ b/instant-xml/src/impls.rs @@ -318,7 +318,7 @@ impl<'xml, T: FromXml<'xml>> FromXml<'xml> for Option { *into = Some(Some(value)); Ok(()) } - None => return Err(Error::MissingValue(&>::KIND)), + None => Err(Error::MissingValue(&>::KIND)), } } }