From 2f3ceab0364497a4a6cf866b505f74443ed6e3ae Mon Sep 17 00:00:00 2001
From: Mathias Hall-Andersen <mathias@hall-andersen.dk>
Date: Wed, 16 Oct 2019 13:40:40 +0200
Subject: Work on porting timer semantics and linux platform

---
 src/platform/mod.rs | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'src/platform/mod.rs')

diff --git a/src/platform/mod.rs b/src/platform/mod.rs
index e83384c..de33714 100644
--- a/src/platform/mod.rs
+++ b/src/platform/mod.rs
@@ -9,26 +9,12 @@ mod linux;
 #[cfg(target_os = "linux")]
 pub use linux::PlatformTun;
 
-/* Syntax is nasty here, due to open issue:
- * https://github.com/rust-lang/rust/issues/38078
- */
-pub trait UDPBind {
+pub trait UDPBind: Bind {
     type Closer;
-    type Error: Error;
-    type Bind: Bind;
 
     /// Bind to a new port, returning the reader/writer and
     /// an associated instance of the Closer type, which closes the UDP socket upon "drop".
-    fn bind(
-        port: u16,
-    ) -> Result<
-        (
-            <<Self as UDPBind>::Bind as Bind>::Reader,
-            <<Self as UDPBind>::Bind as Bind>::Writer,
-            Self::Closer,
-        ),
-        Self::Error,
-    >;
+    fn bind(port: u16) -> Result<(Self::Reader, Self::Writer, Self::Closer), Self::Error>;
 }
 
 pub trait TunBind: Tun {
-- 
cgit v1.2.3-59-g8ed1b