eater/async-std
1
0
Fork 0
forked from mirror/async-std
Code Issues Pull requests Releases Wiki Activity

update to work on smol/master

Browse source
This commit is contained in:
dignifiedquire 2020-04-25 19:05:05 +02:00
parent 10c8b9a6d8
commit 0a7a52aed5
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/os/unix/net/datagram.rs
View file

@ -319,7 +319,8 @@ impl AsRawFd for UnixDatagram {
impl FromRawFd for UnixDatagram { impl FromRawFd for UnixDatagram {
unsafe fn from_raw_fd(fd: RawFd) -> 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 } UnixDatagram { watcher: datagram }
} }
} }

2
src/task/builder.rs
View file

@ -55,7 +55,7 @@ impl Builder {
let wrapped = self.build(future); let wrapped = self.build(future);
let task = wrapped.tag.task().clone(); 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)) Ok(JoinHandle::new(smol_task, task))
} }

2
src/task/spawn_blocking.rs
View file

@ -37,6 +37,6 @@ where
{ {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME); 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)) JoinHandle::new(handle, Task::new(None))
} }