[git-packetline] Even without pin projection lifetimes don't add up

Sebastian Thiel committed 5 years ago

Commit 7e834f51 parent b4ff4e71 file · +6 −11Browse files

Unified · Split

git-packetline/src/read/sidebands/async_io.rs+6−11

 /// An implementor of [`AsyncBufRead`] yielding packet lines on each call to [`read_line()`][AsyncBufRead::read_line()].
 /// It's also possible to hide the underlying packet lines using the [`Read`][AsyncRead] implementation which is useful
 /// if they represent binary data, like the one of a pack file.
-#[pin_project::pin_project(PinnedDrop)]
 pub struct WithSidebands<'a, T, F>
 where
     T: AsyncRead,
 {
-    #[pin]
     state: State<'a, T>,
     handle_progress: Option<F>,
     pos: usize,
     cap: usize,
 }
-#[pin_project::pinned_drop]
+impl<'a, T, F> Drop for WithSidebands<'a, T, F>
-impl<'a, T, F> PinnedDrop for WithSidebands<'a, T, F>
 where
     T: AsyncRead,
 {
-    fn drop(mut self: Pin<&mut Self>) {
+    fn drop(&mut self) {
-        let this = self.project();
+        if let State::Idle { parent } = self.state {
-        if let State::Idle { parent } = this.state.get_mut() {
             parent.reset();
         }
     }
 impl<'a, T, F> AsyncBufRead for WithSidebands<'a, T, F>
 where
     T: AsyncRead + Unpin + Send,
-    F: FnMut(bool, &[u8]),
+    F: FnMut(bool, &[u8]) + Unpin,
 {
     fn poll_fill_buf(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<std::io::Result<&[u8]>> {
         use futures_lite::FutureExt;
     }
     fn consume(self: Pin<&mut Self>, amt: usize) {
-        let this = self.project();
+        self.pos = std::cmp::min(self.pos + amt, self.cap);
-        *this.pos = std::cmp::min(*this.pos + amt, *this.cap);
     }
 }
 impl<'a, T, F> AsyncRead for WithSidebands<'a, T, F>
 where
     T: AsyncRead + Unpin + Send,
-    F: FnMut(bool, &[u8]),
+    F: FnMut(bool, &[u8]) + Unpin,
 {
     fn poll_read(mut self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &mut [u8]) -> Poll<std::io::Result<usize>> {
         let nread = {