From e3a517bf0d387e0784f949edee1de9396d0748ca Mon Sep 17 00:00:00 2001 From: Artem Vorotnikov Date: Mon, 15 Apr 2019 20:24:09 +0300 Subject: [PATCH] Remove compat and transmute for they are no longer needed --- bincode-transport/src/compat.rs | 23 ----------------------- bincode-transport/src/lib.rs | 6 ++---- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 bincode-transport/src/compat.rs diff --git a/bincode-transport/src/compat.rs b/bincode-transport/src/compat.rs deleted file mode 100644 index 16a28cb..0000000 --- a/bincode-transport/src/compat.rs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2018 Google LLC -// -// Use of this source code is governed by an MIT-style -// license that can be found in the LICENSE file or at -// https://opensource.org/licenses/MIT. - -use futures::compat::*; -use futures_legacy::task::Spawn as Spawn01; - -#[allow(dead_code)] -struct Compat01As03SinkExposed { - inner: Spawn01, - buffer: Option, - close_started: bool, -} - -pub fn exposed_compat_exec(input: &Compat01As03Sink, f: F) -> T -where - F: FnOnce(&S) -> T, -{ - let exposed = unsafe { std::mem::transmute::<_, &Compat01As03SinkExposed>(input) }; - f(exposed.inner.get_ref()) -} diff --git a/bincode-transport/src/lib.rs b/bincode-transport/src/lib.rs index 7a5e657..cf16dd3 100644 --- a/bincode-transport/src/lib.rs +++ b/bincode-transport/src/lib.rs @@ -24,8 +24,6 @@ use std::{ use tokio_io::{AsyncRead, AsyncWrite}; use tokio_tcp::{TcpListener, TcpStream}; -mod compat; - /// A transport that serializes to, and deserializes from, a [`TcpStream`]. #[derive(Debug)] pub struct Transport { @@ -100,11 +98,11 @@ where type SinkItem = SinkItem; fn peer_addr(&self) -> io::Result { - compat::exposed_compat_exec(&self.inner, |conn| conn.get_ref().peer_addr()) + self.inner.get_ref().get_ref().peer_addr() } fn local_addr(&self) -> io::Result { - compat::exposed_compat_exec(&self.inner, |conn| conn.get_ref().local_addr()) + self.inner.get_ref().get_ref().local_addr() } }