From a8c66bc783506e99120f848c80e23c4d8107d3d1 Mon Sep 17 00:00:00 2001
From: Link Mauve <ffmpeg@linkmauve.fr>
Date: Fri, 18 Apr 2025 23:58:07 +0200
Subject: [PATCH] minidom, tokio-xmpp: Use Option::as_deref()

This simplifies the Option::as_ref().map(|foo| &**foo) pattern a lot.

skip-changelog: Completely internal change.
---
 minidom/src/element.rs                | 2 +-
 tokio-xmpp/src/xmlstream/initiator.rs | 6 +++---
 tokio-xmpp/src/xmlstream/responder.rs | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/minidom/src/element.rs b/minidom/src/element.rs
index 21f96b1c75a240a4b2a79fc76fb0c71c9909198a..4b80a9b63717a9051d47bfdfe815c5fde876fb9b 100644
--- a/minidom/src/element.rs
+++ b/minidom/src/element.rs
@@ -399,7 +399,7 @@ impl Element {
     pub fn write_to_inner<W: io::Write>(&self, writer: &mut ItemWriter<W>) -> Result<()> {
         for (prefix, namespace) in self.prefixes.declared_prefixes() {
             assert!(writer.encoder.ns_tracker_mut().declare_fixed(
-                prefix.as_ref().map(|x| (&**x).try_into()).transpose()?,
+                prefix.as_deref().map(TryInto::try_into).transpose()?,
                 namespace.clone().into(),
             ));
         }
diff --git a/tokio-xmpp/src/xmlstream/initiator.rs b/tokio-xmpp/src/xmlstream/initiator.rs
index 4682548d96a776905678b18c444b61fd4cce8454..53f24ffa1a273ee807b2136363e83b757347b302 100644
--- a/tokio-xmpp/src/xmlstream/initiator.rs
+++ b/tokio-xmpp/src/xmlstream/initiator.rs
@@ -55,9 +55,9 @@ impl<Io> PendingFeaturesRecv<Io> {
     /// The stream header contents as sent by the peer.
     pub fn header(&self) -> StreamHeader<'_> {
         StreamHeader {
-            from: self.header.from.as_ref().map(|x| Cow::Borrowed(&**x)),
-            to: self.header.to.as_ref().map(|x| Cow::Borrowed(&**x)),
-            id: self.header.id.as_ref().map(|x| Cow::Borrowed(&**x)),
+            from: self.header.from.as_deref().map(Cow::Borrowed),
+            to: self.header.to.as_deref().map(Cow::Borrowed),
+            id: self.header.id.as_deref().map(Cow::Borrowed),
         }
     }
 
diff --git a/tokio-xmpp/src/xmlstream/responder.rs b/tokio-xmpp/src/xmlstream/responder.rs
index dea183ffdde5e6e0cc6eeaffb86b3d553c31c7f6..dd28ba8c0959d74609ffe51445c3d8d9f7670479 100644
--- a/tokio-xmpp/src/xmlstream/responder.rs
+++ b/tokio-xmpp/src/xmlstream/responder.rs
@@ -33,9 +33,9 @@ impl<Io> AcceptedStream<Io> {
     /// The stream header contents as sent by the peer.
     pub fn header(&self) -> StreamHeader<'_> {
         StreamHeader {
-            from: self.header.from.as_ref().map(|x| Cow::Borrowed(&**x)),
-            to: self.header.to.as_ref().map(|x| Cow::Borrowed(&**x)),
-            id: self.header.id.as_ref().map(|x| Cow::Borrowed(&**x)),
+            from: self.header.from.as_deref().map(Cow::Borrowed),
+            to: self.header.to.as_deref().map(Cow::Borrowed),
+            id: self.header.id.as_deref().map(Cow::Borrowed),
         }
     }