chore: Remove unnecessary pin-project

hyperium · Jan 9, 2025 · 2864ec9 · 2864ec9
1 parent 48b970b
commit 2864ec9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 22 deletions.
diff --git a/tonic-health/Cargo.toml b/tonic-health/Cargo.toml
@@ -19,7 +19,6 @@ default = ["transport"]
 transport = []
 
 [dependencies]
-pin-project = "1"
 prost = "0.13"
 tokio = {version = "1.0", features = ["sync"]}
 tokio-stream = {version = "0.1", features = ["sync"]}

diff --git a/tonic-health/src/server.rs b/tonic-health/src/server.rs
@@ -3,7 +3,6 @@
 use crate::pb::health_server::{Health, HealthServer};
 use crate::pb::{HealthCheckRequest, HealthCheckResponse};
 use crate::ServingStatus;
-use pin_project::pin_project;
 use std::collections::HashMap;
 use std::fmt;
 use std::sync::Arc;
@@ -150,9 +149,7 @@ impl Health for HealthService {
 }
 
 /// A watch stream for the health service.
-#[pin_project]
 pub struct WatchStream {
-    #[pin]
     inner: tokio_stream::wrappers::WatchStream<ServingStatus>,
 }
 
@@ -167,11 +164,10 @@ impl Stream for WatchStream {
     type Item = Result<HealthCheckResponse, Status>;
 
     fn poll_next(
-        self: std::pin::Pin<&mut Self>,
+        mut self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
     ) -> std::task::Poll<Option<Self::Item>> {
-        self.project()
-            .inner
+        std::pin::Pin::new(&mut self.inner)
             .poll_next(cx)
             .map(|opt| opt.map(|status| Ok(HealthCheckResponse::new(status))))
     }

diff --git a/tonic-reflection/Cargo.toml b/tonic-reflection/Cargo.toml
@@ -26,7 +26,6 @@ server = ["prost-types", "dep:tokio", "dep:tokio-stream"]
 default = ["server"]
 
 [dependencies]
-pin-project = "1"
 prost = "0.13"
 prost-types = {version = "0.13", optional = true}
 tokio = { version = "1.0", features = ["sync", "rt"], optional = true }

diff --git a/tonic-reflection/src/server/v1.rs b/tonic-reflection/src/server/v1.rs
@@ -1,6 +1,5 @@
 use std::{fmt, sync::Arc};
 
-use pin_project::pin_project;
 use tokio::sync::mpsc;
 use tokio_stream::{wrappers::ReceiverStream, Stream, StreamExt};
 use tonic::{Request, Response, Status, Streaming};
@@ -108,19 +107,16 @@ impl From<ReflectionServiceState> for ReflectionService {
 }
 
 /// A response stream.
-#[pin_project]
-pub struct ServerReflectionInfoStream(
-    #[pin] ReceiverStream<Result<ServerReflectionResponse, Status>>,
-);
+pub struct ServerReflectionInfoStream(ReceiverStream<Result<ServerReflectionResponse, Status>>);
 
 impl Stream for ServerReflectionInfoStream {
     type Item = Result<ServerReflectionResponse, Status>;
 
     fn poll_next(
-        self: std::pin::Pin<&mut Self>,
+        mut self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
     ) -> std::task::Poll<Option<Self::Item>> {
-        self.project().0.poll_next(cx)
+        std::pin::Pin::new(&mut self.0).poll_next(cx)
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {

diff --git a/tonic-reflection/src/server/v1alpha.rs b/tonic-reflection/src/server/v1alpha.rs
@@ -1,6 +1,5 @@
 use std::{fmt, sync::Arc};
 
-use pin_project::pin_project;
 use tokio::sync::mpsc;
 use tokio_stream::{wrappers::ReceiverStream, Stream, StreamExt};
 use tonic::{Request, Response, Status, Streaming};
@@ -108,19 +107,16 @@ impl From<ReflectionServiceState> for ReflectionService {
 }
 
 /// A response stream.
-#[pin_project]
-pub struct ServerReflectionInfoStream(
-    #[pin] ReceiverStream<Result<ServerReflectionResponse, Status>>,
-);
+pub struct ServerReflectionInfoStream(ReceiverStream<Result<ServerReflectionResponse, Status>>);
 
 impl Stream for ServerReflectionInfoStream {
     type Item = Result<ServerReflectionResponse, Status>;
 
     fn poll_next(
-        self: std::pin::Pin<&mut Self>,
+        mut self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
     ) -> std::task::Poll<Option<Self::Item>> {
-        self.project().0.poll_next(cx)
+        std::pin::Pin::new(&mut self.0).poll_next(cx)
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {