From 0a7a52aed50ff288e81ae861e97928a8ac280436 Mon Sep 17 00:00:00 2001
From: dignifiedquire <me@dignifiedquire.com>
Date: Sat, 25 Apr 2020 19:05:05 +0200
Subject: [PATCH] update to work on smol/master

---
 src/os/unix/net/datagram.rs | 3 ++-
 src/task/builder.rs         | 2 +-
 src/task/spawn_blocking.rs  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/os/unix/net/datagram.rs b/src/os/unix/net/datagram.rs
index c73c9ce..6a30b02 100644
--- a/src/os/unix/net/datagram.rs
+++ b/src/os/unix/net/datagram.rs
@@ -319,7 +319,8 @@ impl AsRawFd for UnixDatagram {
 
 impl FromRawFd for UnixDatagram {
     unsafe fn from_raw_fd(fd: RawFd) -> UnixDatagram {
-        let datagram = Async::<StdUnixDatagram>::from_raw_fd(fd);
+        let raw = StdUnixDatagram::from_raw_fd(fd);
+        let datagram = Async::<StdUnixDatagram>::new(raw).expect("invalid file descriptor");
         UnixDatagram { watcher: datagram }
     }
 }
diff --git a/src/task/builder.rs b/src/task/builder.rs
index aa9f0c0..51a5898 100644
--- a/src/task/builder.rs
+++ b/src/task/builder.rs
@@ -55,7 +55,7 @@ impl Builder {
         let wrapped = self.build(future);
 
         let task = wrapped.tag.task().clone();
-        let smol_task = smol::Task::spawn(wrapped).detach();
+        let smol_task = smol::Task::spawn(wrapped).into();
 
         Ok(JoinHandle::new(smol_task, task))
     }
diff --git a/src/task/spawn_blocking.rs b/src/task/spawn_blocking.rs
index 054f3fd..e9ed0c5 100644
--- a/src/task/spawn_blocking.rs
+++ b/src/task/spawn_blocking.rs
@@ -37,6 +37,6 @@ where
 {
     once_cell::sync::Lazy::force(&crate::rt::RUNTIME);
 
-    let handle = smol::Task::blocking(async move { f() }).detach();
+    let handle = smol::Task::blocking(async move { f() }).into();
     JoinHandle::new(handle, Task::new(None))
 }