Merge pull request #892 from Mingun/fix-lifetime-warns

Fix new `mismatched_lifetime_syntaxes` warning from Rust 1.89

Author: Mingun

src/escape.rs

@@ -207,7 +207,7 @@ pub(crate) fn _escape<'a, F: Fn(u8) -> bool>(
 ///
 /// [`escape-html`]: ../index.html#escape-html
 /// [HTML5 escapes]: https://dev.w3.org/html5/html-author/charref
-pub fn unescape(raw: &str) -> Result<Cow<str>, EscapeError> {
+pub fn unescape(raw: &str) -> Result<Cow<'_, str>, EscapeError> {
     unescape_with(raw, resolve_predefined_entity)
 }
 

src/events/mod.rs

@@ -183,7 +183,7 @@ impl<'a> BytesStart<'a> {
     /// ```
     ///
     /// [`to_end`]: Self::to_end
-    pub fn borrow(&self) -> BytesStart {
+    pub fn borrow(&self) -> BytesStart<'_> {
         BytesStart {
             buf: Cow::Borrowed(&self.buf),
             name_len: self.name_len,
@@ -193,7 +193,7 @@ impl<'a> BytesStart<'a> {
 
     /// Creates new paired close tag
     #[inline]
-    pub fn to_end(&self) -> BytesEnd {
+    pub fn to_end(&self) -> BytesEnd<'_> {
         BytesEnd::from(self.name())
     }
 
@@ -213,7 +213,7 @@ impl<'a> BytesStart<'a> {
 
     /// Gets the undecoded raw tag name, as present in the input stream.
     #[inline]
-    pub fn name(&self) -> QName {
+    pub fn name(&self) -> QName<'_> {
         QName(&self.buf[..self.name_len])
     }
 
@@ -222,7 +222,7 @@ impl<'a> BytesStart<'a> {
     ///
     /// All content up to and including the first `:` character is removed from the tag name.
     #[inline]
-    pub fn local_name(&self) -> LocalName {
+    pub fn local_name(&self) -> LocalName<'_> {
         self.name().into()
     }
 
@@ -283,12 +283,12 @@ impl<'a> BytesStart<'a> {
     }
 
     /// Returns an iterator over the attributes of this tag.
-    pub fn attributes(&self) -> Attributes {
+    pub fn attributes(&self) -> Attributes<'_> {
         Attributes::wrap(&self.buf, self.name_len, false, self.decoder)
     }
 
     /// Returns an iterator over the HTML-like attributes of this tag (no mandatory quotes or `=`).
-    pub fn html_attributes(&self) -> Attributes {
+    pub fn html_attributes(&self) -> Attributes<'_> {
         Attributes::wrap(&self.buf, self.name_len, true, self.decoder)
     }
 
@@ -432,15 +432,15 @@ impl<'a> BytesEnd<'a> {
 
     /// Converts the event into a borrowed event.
     #[inline]
-    pub fn borrow(&self) -> BytesEnd {
+    pub fn borrow(&self) -> BytesEnd<'_> {
         BytesEnd {
             name: Cow::Borrowed(&self.name),
         }
     }
 
     /// Gets the undecoded raw tag name, as present in the input stream.
     #[inline]
-    pub fn name(&self) -> QName {
+    pub fn name(&self) -> QName<'_> {
         QName(&self.name)
     }
 
@@ -449,7 +449,7 @@ impl<'a> BytesEnd<'a> {
     ///
     /// All content up to and including the first `:` character is removed from the tag name.
     #[inline]
-    pub fn local_name(&self) -> LocalName {
+    pub fn local_name(&self) -> LocalName<'_> {
         self.name().into()
     }
 }
@@ -571,7 +571,7 @@ impl<'a> BytesText<'a> {
 
     /// Converts the event into a borrowed event.
     #[inline]
-    pub fn borrow(&self) -> BytesText {
+    pub fn borrow(&self) -> BytesText<'_> {
         BytesText {
             content: Cow::Borrowed(&self.content),
             decoder: self.decoder,
@@ -792,7 +792,7 @@ impl<'a> BytesCData<'a> {
 
     /// Converts the event into a borrowed event.
     #[inline]
-    pub fn borrow(&self) -> BytesCData {
+    pub fn borrow(&self) -> BytesCData<'_> {
         BytesCData {
             content: Cow::Borrowed(&self.content),
             decoder: self.decoder,
@@ -1070,7 +1070,7 @@ impl<'a> BytesPI<'a> {
 
     /// Converts the event into a borrowed event.
     #[inline]
-    pub fn borrow(&self) -> BytesPI {
+    pub fn borrow(&self) -> BytesPI<'_> {
         BytesPI {
             content: self.content.borrow(),
         }
@@ -1140,7 +1140,7 @@ impl<'a> BytesPI<'a> {
     /// }
     /// ```
     #[inline]
-    pub fn attributes(&self) -> Attributes {
+    pub fn attributes(&self) -> Attributes<'_> {
         self.content.attributes()
     }
 }
@@ -1300,7 +1300,7 @@ impl<'a> BytesDecl<'a> {
     /// ```
     ///
     /// [grammar]: https://www.w3.org/TR/xml11/#NT-XMLDecl
-    pub fn version(&self) -> Result<Cow<[u8]>, Error> {
+    pub fn version(&self) -> Result<Cow<'_, [u8]>, Error> {
         // The version *must* be the first thing in the declaration.
         match self.content.attributes().with_checks(false).next() {
             Some(Ok(a)) if a.key.as_ref() == b"version" => Ok(a.value),
@@ -1355,7 +1355,7 @@ impl<'a> BytesDecl<'a> {
     /// ```
     ///
     /// [grammar]: https://www.w3.org/TR/xml11/#NT-XMLDecl
-    pub fn encoding(&self) -> Option<Result<Cow<[u8]>, AttrError>> {
+    pub fn encoding(&self) -> Option<Result<Cow<'_, [u8]>, AttrError>> {
         self.content
             .try_get_attribute("encoding")
             .map(|a| a.map(|a| a.value))
@@ -1397,7 +1397,7 @@ impl<'a> BytesDecl<'a> {
     /// ```
     ///
     /// [grammar]: https://www.w3.org/TR/xml11/#NT-XMLDecl
-    pub fn standalone(&self) -> Option<Result<Cow<[u8]>, AttrError>> {
+    pub fn standalone(&self) -> Option<Result<Cow<'_, [u8]>, AttrError>> {
         self.content
             .try_get_attribute("standalone")
             .map(|a| a.map(|a| a.value))
@@ -1426,7 +1426,7 @@ impl<'a> BytesDecl<'a> {
 
     /// Converts the event into a borrowed event.
     #[inline]
-    pub fn borrow(&self) -> BytesDecl {
+    pub fn borrow(&self) -> BytesDecl<'_> {
         BytesDecl {
             content: self.content.borrow(),
         }
@@ -1523,7 +1523,7 @@ impl<'a> BytesRef<'a> {
 
     /// Converts the event into a borrowed event.
     #[inline]
-    pub fn borrow(&self) -> BytesRef {
+    pub fn borrow(&self) -> BytesRef<'_> {
         BytesRef {
             content: Cow::Borrowed(&self.content),
             decoder: self.decoder,
@@ -1703,7 +1703,7 @@ impl<'a> Event<'a> {
 
     /// Converts the event into a borrowed event.
     #[inline]
-    pub fn borrow(&self) -> Event {
+    pub fn borrow(&self) -> Event<'_> {
         match self {
             Event::Start(e) => Event::Start(e.borrow()),
             Event::End(e) => Event::End(e.borrow()),

src/name.rs

@@ -636,7 +636,7 @@ impl NamespaceResolver {
         &self,
         name: QName<'n>,
         use_default: bool,
-    ) -> (ResolveResult, LocalName<'n>) {
+    ) -> (ResolveResult<'_>, LocalName<'n>) {
         let (local_name, prefix) = name.decompose();
         (self.resolve_prefix(prefix, use_default), local_name)
     }
@@ -652,11 +652,11 @@ impl NamespaceResolver {
     /// [namespace name]: https://www.w3.org/TR/xml-names11/#dt-NSName
     /// [unbound]: https://www.w3.org/TR/xml-names11/#scoping
     #[inline]
-    pub fn find(&self, element_name: QName) -> ResolveResult {
+    pub fn find(&self, element_name: QName) -> ResolveResult<'_> {
         self.resolve_prefix(element_name.prefix(), true)
     }
 
-    fn resolve_prefix(&self, prefix: Option<Prefix>, use_default: bool) -> ResolveResult {
+    fn resolve_prefix(&self, prefix: Option<Prefix>, use_default: bool) -> ResolveResult<'_> {
         self.bindings
             .iter()
             // Find the last defined binding that corresponds to the given prefix
@@ -690,7 +690,7 @@ impl NamespaceResolver {
     }
 
     #[inline]
-    pub const fn iter(&self) -> PrefixIter {
+    pub const fn iter(&self) -> PrefixIter<'_> {
         PrefixIter {
             resolver: self,
             // We initialize the cursor to 2 to skip the two default namespaces xml: and xmlns:

src/reader/mod.rs

@@ -970,7 +970,7 @@ impl<R> Reader<R> {
     /// assert_eq!(reader.read_event().unwrap(), Event::Eof);
     /// ```
     #[inline]
-    pub fn stream(&mut self) -> BinaryStream<R> {
+    pub fn stream(&mut self) -> BinaryStream<'_, R> {
         BinaryStream {
             inner: &mut self.reader,
             offset: &mut self.state.offset,

src/reader/ns_reader.rs

@@ -130,7 +130,7 @@ impl<R> NsReader<R> {
     /// # quick_xml::Result::Ok(())
     /// ```
     #[inline]
-    pub const fn prefixes(&self) -> PrefixIter {
+    pub const fn prefixes(&self) -> PrefixIter<'_> {
         self.ns_resolver.iter()
     }
 }
@@ -188,7 +188,7 @@ impl<R> NsReader<R> {
     pub(super) fn resolve_event<'i>(
         &mut self,
         event: Result<Event<'i>>,
-    ) -> Result<(ResolveResult, Event<'i>)> {
+    ) -> Result<(ResolveResult<'_>, Event<'i>)> {
         match event {
             Ok(Event::Start(e)) => Ok((self.ns_resolver.find(e.name()), Event::Start(e))),
             Ok(Event::Empty(e)) => Ok((self.ns_resolver.find(e.name()), Event::Empty(e))),
@@ -249,7 +249,11 @@ impl<R> NsReader<R> {
     /// [`resolve_attribute()`]: Self::resolve_attribute()
     /// [`resolve_element()`]: Self::resolve_element()
     #[inline]
-    pub fn resolve<'n>(&self, name: QName<'n>, attribute: bool) -> (ResolveResult, LocalName<'n>) {
+    pub fn resolve<'n>(
+        &self,
+        name: QName<'n>,
+        attribute: bool,
+    ) -> (ResolveResult<'_>, LocalName<'n>) {
         self.ns_resolver.resolve(name, !attribute)
     }
 
@@ -305,7 +309,7 @@ impl<R> NsReader<R> {
     /// [`Unknown`]: ResolveResult::Unknown
     /// [`read_resolved_event()`]: Self::read_resolved_event
     #[inline]
-    pub fn resolve_element<'n>(&self, name: QName<'n>) -> (ResolveResult, LocalName<'n>) {
+    pub fn resolve_element<'n>(&self, name: QName<'n>) -> (ResolveResult<'_>, LocalName<'n>) {
         self.ns_resolver.resolve(name, true)
     }
 
@@ -375,7 +379,7 @@ impl<R> NsReader<R> {
     /// [`Unbound`]: ResolveResult::Unbound
     /// [`Unknown`]: ResolveResult::Unknown
     #[inline]
-    pub fn resolve_attribute<'n>(&self, name: QName<'n>) -> (ResolveResult, LocalName<'n>) {
+    pub fn resolve_attribute<'n>(&self, name: QName<'n>) -> (ResolveResult<'_>, LocalName<'n>) {
         self.ns_resolver.resolve(name, false)
     }
 }
@@ -498,7 +502,7 @@ impl<R: BufRead> NsReader<R> {
     pub fn read_resolved_event_into<'b>(
         &mut self,
         buf: &'b mut Vec<u8>,
-    ) -> Result<(ResolveResult, Event<'b>)> {
+    ) -> Result<(ResolveResult<'_>, Event<'b>)> {
         let event = self.read_event_impl(buf);
         self.resolve_event(event)
     }
@@ -742,7 +746,7 @@ impl<'i> NsReader<&'i [u8]> {
     /// [`End`]: Event::End
     /// [`read_event()`]: Self::read_event
     #[inline]
-    pub fn read_resolved_event(&mut self) -> Result<(ResolveResult, Event<'i>)> {
+    pub fn read_resolved_event(&mut self) -> Result<(ResolveResult<'_>, Event<'i>)> {
         let event = self.read_event_impl(());
         self.resolve_event(event)
     }

src/se/content.rs

@@ -110,7 +110,10 @@ impl<'w, 'i, W: Write> ContentSerializer<'w, 'i, W> {
     /// Creates new serializer that shares state with this serializer and
     /// writes to the same underlying writer
     #[inline]
-    pub fn new_seq_element_serializer(&mut self, allow_primitive: bool) -> ContentSerializer<W> {
+    pub fn new_seq_element_serializer(
+        &mut self,
+        allow_primitive: bool,
+    ) -> ContentSerializer<'_, '_, W> {
         ContentSerializer {
             writer: self.writer,
             level: self.level,

src/se/mod.rs

@@ -493,7 +493,7 @@ pub(crate) enum Indent<'i> {
 }
 
 impl<'i> Indent<'i> {
-    pub fn borrow(&mut self) -> Indent {
+    pub fn borrow(&mut self) -> Indent<'_> {
         match self {
             Self::None => Indent::None,
             Self::Owned(ref mut i) => Indent::Borrow(i),

src/se/simple_type.rs

@@ -25,7 +25,7 @@ pub enum QuoteTarget {
 
 /// Escapes atomic value that could be part of a `xs:list`. All whitespace characters
 /// additionally escaped
-fn escape_item(value: &str, target: QuoteTarget, level: QuoteLevel) -> Cow<str> {
+fn escape_item(value: &str, target: QuoteTarget, level: QuoteLevel) -> Cow<'_, str> {
     use QuoteLevel::*;
     use QuoteTarget::*;
 
@@ -94,7 +94,7 @@ fn escape_item(value: &str, target: QuoteTarget, level: QuoteLevel) -> Cow<str>
 }
 
 /// Escapes XSD simple type value
-fn escape_list(value: &str, target: QuoteTarget, level: QuoteLevel) -> Cow<str> {
+fn escape_list(value: &str, target: QuoteTarget, level: QuoteLevel) -> Cow<'_, str> {
     use QuoteLevel::*;
     use QuoteTarget::*;