Remove use for map

mxinden · Sep 3, 2023 · a80d726 · a80d726
1 parent e497cb2
commit a80d726
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/libp2p/src/builder.rs b/libp2p/src/builder.rs
@@ -7,7 +7,6 @@ use std::sync::Arc;
 
 use crate::bandwidth::BandwidthSinks;
 use crate::TransportExt;
-use map::Map as MapUpgrade;
 
 #[cfg(all(
     not(target_arch = "wasm32"),
@@ -333,7 +332,7 @@ macro_rules! impl_tcp_noise_builder {
                 Ok(construct_quic_builder!(
                     self,
                     $tcp,
-                    MapUpgrade::new(
+                    map::Upgrade::new(
                         libp2p_core::upgrade::SelectUpgrade::new(
                             self.phase.tls_config,
                             libp2p_noise::Config::new(&self.keypair)
@@ -953,7 +952,7 @@ impl<Provider, T: AuthenticatedMultiplexedTransport>
     > {
         Ok(construct_websocket_builder!(
             self,
-            MapUpgrade::new(
+            map::Upgrade::new(
                 libp2p_core::upgrade::SelectUpgrade::new(
                     self.phase.tls_config,
                     libp2p_noise::Config::new(&self.keypair)
@@ -1220,7 +1219,7 @@ macro_rules! impl_websocket_noise_builder {
                 construct_behaviour_builder!(
                     self,
                     $dnsTcp,
-                    MapUpgrade::new(
+                    map::Upgrade::new(
                         libp2p_core::upgrade::SelectUpgrade::new(
                             self.phase.tls_config,
                             libp2p_noise::Config::new(&self.keypair).map_err(|e| WebsocketError(AuthenticationErrorInner::from(e).into()))?,

diff --git a/libp2p/src/builder/map.rs b/libp2p/src/builder/map.rs
@@ -23,19 +23,19 @@ use futures::future::{self, TryFutureExt};
 
 /// Upgrade applying a function to an inner upgrade.
 #[derive(Debug, Clone)]
-pub(crate) struct Map<U, F> {
+pub(crate) struct Upgrade<U, F> {
     upgrade: U,
     fun: F,
 }
 
-impl<U, F> Map<U, F> {
+impl<U, F> Upgrade<U, F> {
     /// Applies the function on the result of the upgrade.
     pub fn new(upgrade: U, fun: F) -> Self {
-        Map { upgrade, fun }
+        Upgrade { upgrade, fun }
     }
 }
 
-impl<U, F> UpgradeInfo for Map<U, F>
+impl<U, F> UpgradeInfo for Upgrade<U, F>
 where
     U: UpgradeInfo,
 {
@@ -47,7 +47,7 @@ where
     }
 }
 
-impl<U, F, C, D> InboundUpgrade<C> for Map<U, F>
+impl<U, F, C, D> InboundUpgrade<C> for Upgrade<U, F>
 where
     U: InboundUpgrade<C>,
     F: FnOnce(U::Output) -> D,
@@ -61,7 +61,7 @@ where
     }
 }
 
-impl<U, F, C, D> OutboundUpgrade<C> for Map<U, F>
+impl<U, F, C, D> OutboundUpgrade<C> for Upgrade<U, F>
 where
     U: OutboundUpgrade<C>,
     F: FnOnce(U::Output) -> D,