Update pin-project to 0.4

Cargo.toml

@@ -20,3 +20,15 @@ members = [
   "tower-make",
   "tower-util",
 ]
+
+[patch.crates-io]
+tokio = { git = "https://github.com/tokio-rs/tokio" }
+tokio-codec = { git = "https://github.com/tokio-rs/tokio" }
+tokio-executor = { git = "https://github.com/tokio-rs/tokio" }
+tokio-fs = { git = "https://github.com/tokio-rs/tokio" }
+tokio-io = { git = "https://github.com/tokio-rs/tokio" }
+tokio-macros = { git = "https://github.com/tokio-rs/tokio" }
+tokio-net = { git = "https://github.com/tokio-rs/tokio" }
+tokio-sync = { git = "https://github.com/tokio-rs/tokio" }
+tokio-test = { git = "https://github.com/tokio-rs/tokio" }
+tokio-timer = { git = "https://github.com/tokio-rs/tokio" }

ci/patch.toml

@@ -16,3 +16,14 @@ tower-spawn-ready = { path = "tower-spawn-ready" }
 tower-test = { path = "tower-test" }
 tower-timeout = { path = "tower-timeout" }
 tower-util = { path = "tower-util" }
+
+tokio = { git = "https://github.com/tokio-rs/tokio" }
+tokio-codec = { git = "https://github.com/tokio-rs/tokio" }
+tokio-executor = { git = "https://github.com/tokio-rs/tokio" }
+tokio-fs = { git = "https://github.com/tokio-rs/tokio" }
+tokio-io = { git = "https://github.com/tokio-rs/tokio" }
+tokio-macros = { git = "https://github.com/tokio-rs/tokio" }
+tokio-net = { git = "https://github.com/tokio-rs/tokio" }
+tokio-sync = { git = "https://github.com/tokio-rs/tokio" }
+tokio-test = { git = "https://github.com/tokio-rs/tokio" }
+tokio-timer = { git = "https://github.com/tokio-rs/tokio" }

tower-balance/Cargo.toml

@@ -28,7 +28,7 @@ default = ["log"]
 [dependencies]
 futures-util-preview = "=0.3.0-alpha.18"
 futures-core-preview = "=0.3.0-alpha.18"
-pin-project = "=0.4.0-alpha.11"
+pin-project = "0.4"
 indexmap = "1.0.2"
 tracing = "0.1"
 rand = "0.6.5"

tower-balance/examples/demo.rs

@@ -86,7 +86,7 @@ where
     type Service = S;
     type Error = Error;
     fn poll_discover(
-        mut self: Pin<&mut Self>,
+        self: Pin<&mut Self>,
         _: &mut Context<'_>,
     ) -> Poll<Result<Change<Self::Key, Self::Service>, Self::Error>> {
         match self.project().0.pop() {

tower-balance/src/p2c/make.rs

@@ -75,7 +75,7 @@ where
 {
     type Output = Result<Balance<T, Req>, E>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
         let inner = ready!(this.inner.poll(cx))?;
         let svc = Balance::new(inner, this.rng.clone());

tower-balance/src/p2c/service.rs

@@ -357,7 +357,7 @@ where
 impl<K, S: Service<Req>, Req> Future for UnreadyService<K, S, Req> {
     type Output = Result<(K, S), (K, Error<S::Error>)>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
 
         if let Poll::Ready(Ok(())) = this.cancel.poll(cx) {

tower-balance/src/pool/mod.rs

@@ -91,7 +91,7 @@ where
     type Error = MS::MakeError;
 
     fn poll_discover(
-        mut self: Pin<&mut Self>,
+        self: Pin<&mut Self>,
         cx: &mut Context<'_>,
     ) -> Poll<Result<Change<Self::Key, Self::Service>, Self::Error>> {
         let mut this = self.project();
@@ -374,8 +374,7 @@ where
             // update ewma with a 0 sample
             self.ewma = (1.0 - self.options.alpha) * self.ewma;
 
-            let mut discover = self.balance.discover_mut().as_mut();
-            let discover = discover.project();
+            let discover = self.balance.discover_mut().as_mut().project();
             if self.ewma < self.options.low {
                 if *discover.load != Level::Low {
                     tracing::trace!({ ewma = %self.ewma }, "pool is over-provisioned");
@@ -396,8 +395,7 @@ where
             return Poll::Ready(Ok(()));
         }
 
-        let mut discover = self.balance.discover_mut().as_mut();
-        let discover = discover.project();
+        let discover = self.balance.discover_mut().as_mut().project();
         if discover.making.is_none() {
             // no services are ready -- we're overloaded
             // update ewma with a 1 sample

tower-buffer/Cargo.toml

@@ -27,7 +27,7 @@ default = ["log"]
 
 [dependencies]
 futures-core-preview = "=0.3.0-alpha.18"
-pin-project = { version = "=0.4.0-alpha.11", features = ["project_attr"] }
+pin-project = "0.4"
 tower-service = "=0.3.0-alpha.1"
 tower-layer = { version = "=0.3.0-alpha.1", path = "../tower-layer" }
 tokio-executor = "=0.2.0-alpha.5"

tower-buffer/src/future.rs

@@ -50,12 +50,12 @@ where
     type Output = Result<T, Error>;
 
     #[project]
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let mut this = self.project();
 
         loop {
             #[project]
-            match this.state.project() {
+            match this.state.as_mut().project() {
                 ResponseState::Failed(e) => {
                     return Poll::Ready(Err(e.take().expect("polled after error")));
                 }

tower-discover/Cargo.toml

@@ -24,4 +24,4 @@ edition = "2018"
 [dependencies]
 futures-core-preview = "=0.3.0-alpha.18"
 tower-service = "=0.3.0-alpha.1"
-pin-project = "=0.4.0-alpha.11"
+pin-project = "0.4"

tower-discover/src/list.rs

@@ -44,7 +44,7 @@ where
     type Error = Never;
 
     fn poll_discover(
-        mut self: Pin<&mut Self>,
+        self: Pin<&mut Self>,
         _: &mut Context<'_>,
     ) -> Poll<Result<Change<Self::Key, Self::Service>, Self::Error>> {
         match self.project().inner.next() {

tower-discover/src/stream.rs

@@ -38,7 +38,7 @@ where
     type Error = S::Error;
 
     fn poll_discover(
-        mut self: Pin<&mut Self>,
+        self: Pin<&mut Self>,
         cx: &mut Context<'_>,
     ) -> Poll<Result<Change<Self::Key, Self::Service>, Self::Error>> {
         match ready!(self.project().inner.try_poll_next(cx)).transpose()? {

tower-filter/Cargo.toml

@@ -26,7 +26,7 @@ publish = false
 [dependencies]
 tower-service = "=0.3.0-alpha.1"
 tower-layer = { version = "=0.3.0-alpha.1", path = "../tower-layer" }
-pin-project = { version = "=0.4.0-alpha.11", features = ["project_attr"] }
+pin-project = "0.4"
 futures-core-preview = "=0.3.0-alpha.18"
 
 [dev-dependencies]

tower-filter/src/future.rs

@@ -60,12 +60,12 @@ where
     type Output = Result<S::Response, Error>;
 
     #[project]
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let mut this = self.project();
 
         loop {
             #[project]
-            match this.state.project() {
+            match this.state.as_mut().project() {
                 State::Check(request) => {
                     let request = request
                         .take()

tower-hedge/Cargo.toml

@@ -12,7 +12,7 @@ tower-service = "0.3.0-alpha.1"
 tower-filter = { version = "0.3.0-alpha.1", path = "../tower-filter" }
 tokio-timer = "0.3.0-alpha.4"
 futures-util-preview = "0.3.0-alpha.18"
-pin-project = "0.4.0-alpha.10"
+pin-project = "0.4"
 
 [dev-dependencies]
 tower-test = { version = "0.3.0-alpha.1", path = "../tower-test" }

tower-hedge/src/delay.rs

@@ -85,12 +85,12 @@ where
     type Output = Result<T, super::Error>;
 
     #[project]
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let mut this = self.project();
 
         loop {
             #[project]
-            match this.state.project() {
+            match this.state.as_mut().project() {
                 State::Delaying(delay, req) => {
                     ready!(delay.poll(cx));
                     let req = req.take().expect("Missing request in delay");

tower-hedge/src/latency.rs

@@ -77,7 +77,7 @@ where
 {
     type Output = Result<T, super::Error>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
 
         let rsp = ready!(this.inner.poll(cx))?;

tower-hedge/src/lib.rs

@@ -194,7 +194,7 @@ where
 {
     type Output = Result<S::Response, Error>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         self.project().inner.poll(cx).map_err(Into::into)
     }
 }

tower-hedge/src/select.rs

@@ -88,7 +88,7 @@ where
 {
     type Output = Result<T, super::Error>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
 
         if let Poll::Ready(r) = this.a_fut.poll(cx) {

tower-limit/Cargo.toml

@@ -27,7 +27,7 @@ tower-service = "=0.3.0-alpha.1"
 tower-layer = { version = "=0.3.0-alpha.1", path = "../tower-layer" }
 tokio-sync = "=0.2.0-alpha.5"
 tokio-timer = "=0.3.0-alpha.5"
-pin-project = "=0.4.0-alpha.11"
+pin-project = "0.4"
 
 [dev-dependencies]
 tower-test = { version = "=0.3.0-alpha.1", path = "../tower-test" }

tower-limit/src/concurrency/future.rs

@@ -33,14 +33,14 @@ where
 {
     type Output = Result<T, Error>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         Poll::Ready(ready!(self.project().inner.poll(cx)).map_err(Into::into))
     }
 }
 
 #[pinned_drop]
 impl<T> PinnedDrop for ResponseFuture<T> {
-    fn drop(mut self: Pin<&mut Self>) {
+    fn drop(self: Pin<&mut Self>) {
         self.project().semaphore.add_permits(1);
     }
 }

tower-limit/src/rate/future.rs

@@ -30,7 +30,7 @@ where
 {
     type Output = Result<T, Error>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         Poll::Ready(Ok(ready!(self.project().inner.poll(cx))?))
     }
 }

tower-load-shed/Cargo.toml

@@ -25,7 +25,7 @@ edition = "2018"
 [dependencies]
 tower-service = "=0.3.0-alpha.1"
 tower-layer = { version = "=0.3.0-alpha.1", path = "../tower-layer" }
-pin-project = { version = "=0.4.0-alpha.11", features = ["project_attr"] }
+pin-project = "0.4"
 futures-core-preview = "=0.3.0-alpha.18"
 
 [dev-dependencies]

tower-load-shed/src/future.rs

@@ -45,11 +45,9 @@ where
     type Output = Result<T, Error>;
 
     #[project]
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let mut this = self.project();
-
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         #[project]
-        match this.state.project() {
+        match self.project().state.project() {
             ResponseState::Called(fut) => Poll::Ready(ready!(fut.poll(cx)).map_err(Into::into)),
             ResponseState::Overloaded => Poll::Ready(Err(Overloaded::new().into())),
         }

tower-load/Cargo.toml

@@ -27,7 +27,7 @@ log = "0.4.1"
 tokio-timer = "=0.3.0-alpha.5"
 tower-service = "=0.3.0-alpha.1"
 tower-discover = { version = "=0.3.0-alpha.1", path = "../tower-discover" }
-pin-project = "=0.4.0-alpha.11"
+pin-project = "0.4"
 
 [dev-dependencies]
 tokio-test = "=0.2.0-alpha.5"

tower-load/src/constant.rs

@@ -62,7 +62,7 @@ impl<D: Discover + Unpin, M: Copy> Discover for Constant<D, M> {
 
     /// Yields the next discovery change set.
     fn poll_discover(
-        mut self: Pin<&mut Self>,
+        self: Pin<&mut Self>,
         cx: &mut Context<'_>,
     ) -> Poll<Result<Change<D::Key, Self::Service>, D::Error>> {
         use self::Change::*;

tower-load/src/instrument.rs

@@ -66,7 +66,7 @@ where
 {
     type Output = Result<I::Output, E>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
         let rsp = ready!(this.future.poll(cx))?;
         let h = this.handle.take().expect("handle");

tower-load/src/peak_ewma.rs

@@ -120,7 +120,7 @@ where
     type Error = D::Error;
 
     fn poll_discover(
-        mut self: Pin<&mut Self>,
+        self: Pin<&mut Self>,
         cx: &mut Context<'_>,
     ) -> Poll<Result<Change<D::Key, Self::Service>, D::Error>> {
         let this = self.project();

tower-load/src/pending_requests.rs

@@ -117,7 +117,7 @@ where
 
     /// Yields the next discovery change set.
     fn poll_discover(
-        mut self: Pin<&mut Self>,
+        self: Pin<&mut Self>,
         cx: &mut Context<'_>,
     ) -> Poll<Result<Change<D::Key, Self::Service>, D::Error>> {
         use self::Change::*;

tower-reconnect/Cargo.toml

@@ -25,4 +25,4 @@ edition = "2018"
 log = "0.4.1"
 tower-service = "=0.3.0-alpha.1"
 tower-make = { version = "=0.3.0-alpha.2", path = "../tower-make" }
-pin-project = "=0.4.0-alpha.11"
+pin-project = "0.4"

tower-reconnect/src/future.rs

@@ -26,7 +26,7 @@ where
 {
     type Output = Result<T, Error>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         self.project().inner.poll(cx).map_err(Into::into)
     }
 }

tower-retry/Cargo.toml

@@ -25,7 +25,7 @@ edition = "2018"
 tower-service = "=0.3.0-alpha.1"
 tower-layer = { version = "=0.3.0-alpha.1", path = "../tower-layer" }
 tokio-timer = "=0.3.0-alpha.5"
-pin-project = { version = "=0.4.0-alpha.11", features = ["project_attr"] }
+pin-project = "0.4"
 futures-core-preview = "=0.3.0-alpha.18"
 
 [dev-dependencies]