cleanup

hyperium · Aug 26, 2024 · cbb7ae7 · cbb7ae7
1 parent dc8e0c2
commit cbb7ae7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 47 deletions.
diff --git a/h3-datagram/src/datagram_traits.rs b/h3-datagram/src/datagram_traits.rs
@@ -9,7 +9,7 @@ use h3::{
 
 use crate::server::ReadDatagram;
 
-pub trait HandleDatagrams<C, B>
+pub trait HandleDatagramsExt<C, B>
 where
     B: Buf,
     C: quic::Connection<B>,

diff --git a/h3-datagram/src/server.rs b/h3-datagram/src/server.rs
@@ -16,11 +16,11 @@ use pin_project_lite::pin_project;
 
 use crate::{
     datagram::Datagram,
-    datagram_traits::HandleDatagrams,
+    datagram_traits::HandleDatagramsExt,
     quic_traits::{self, RecvDatagramExt, SendDatagramExt},
 };
 
-impl<B, C> HandleDatagrams<C, B> for Connection<C, B>
+impl<B, C> HandleDatagramsExt<C, B> for Connection<C, B>
 where
     B: Buf,
     C: quic::Connection<B> + SendDatagramExt<B> + RecvDatagramExt,
@@ -32,9 +32,6 @@ where
         self.inner
             .conn
             .send_datagram(Datagram::new(stream_id, data))?;
-        //Todo Import tracing
-        //tracing::info!("Sent datagram");
-
         Ok(())
     }
 
@@ -68,8 +65,6 @@ where
     type Output = Result<Option<Datagram<C::Buf>>, Error>;
 
     fn poll(mut self: std::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        //Todo Import tracing
-        // tracing::trace!("poll: read_datagram");
         match ready!(self.conn.inner.conn.poll_accept_datagram(cx))? {
             Some(v) => Poll::Ready(Ok(Some(Datagram::decode(v)?))),
             None => Poll::Ready(Ok(None)),

diff --git a/h3-webtransport/src/server.rs b/h3-webtransport/src/server.rs
@@ -26,7 +26,7 @@ use h3::{
 };
 use h3_datagram::{
     datagram::Datagram,
-    datagram_traits::HandleDatagrams,
+    datagram_traits::HandleDatagramsExt,
     quic_traits::{RecvDatagramExt, SendDatagramExt},
 };
 use http::{Method, Request, Response, StatusCode};
@@ -44,7 +44,7 @@ use crate::stream::{BidiStream, RecvStream, SendStream};
 pub struct WebTransportSession<C, B>
 where
     C: quic::Connection<B>,
-    Connection<C, B>: HandleDatagrams<C, B>,
+    Connection<C, B>: HandleDatagramsExt<C, B>,
     B: Buf,
 {
     // See: https://datatracker.ietf.org/doc/html/draft-ietf-webtrans-http3/#section-2-3
@@ -57,7 +57,7 @@ where
 
 impl<C, B> WebTransportSession<C, B>
 where
-    Connection<C, B>: HandleDatagrams<C, B>,
+    Connection<C, B>: HandleDatagramsExt<C, B>,
     C: quic::Connection<B>,
     B: Buf,
 {

diff --git a/h3/src/server/connection.rs b/h3/src/server/connection.rs
@@ -427,42 +427,6 @@ where
     }
 }
 
-/*
-impl<C, B> Connection<C, B>
-where
-    C: quic::Connection<B> + SendDatagramExt<B>,
-    B: Buf,
-{
-    /// Sends a datagram
-    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
-    pub fn send_datagram(&mut self, stream_id: StreamId, data: B) -> Result<(), Error> {
-        self.inner
-            .conn
-            .send_datagram(Datagram::new(stream_id, data))?;
-
-        #[cfg(feature = "tracing")]
-        tracing::info!("Sent datagram");
-
-        Ok(())
-    }
-}
-
-impl<C, B> Connection<C, B>
-where
-    C: quic::Connection<B> + RecvDatagramExt,
-    B: Buf,
-{
-    /// Reads an incoming datagram
-    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
-    pub fn read_datagram(&mut self) -> ReadDatagram<C, B> {
-        ReadDatagram {
-            conn: self,
-            _marker: PhantomData,
-        }
-    }
-}
-    */
-
 impl<C, B> Drop for Connection<C, B>
 where
     C: quic::Connection<B>,