Migrate/update to `tokio` crate.
* Migrate from `tokio_core` to `tokio`. * Bump version to 0.2.
This commit is contained in:
parent
0b9b728eae
commit
b4c9d87f1d
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "tokio-named-pipes"
|
name = "tokio-named-pipes"
|
||||||
version = "0.1.0"
|
version = "0.2.0"
|
||||||
authors = ["Alex Crichton <alex@alexcrichton.com>"]
|
authors = ["Alex Crichton <alex@alexcrichton.com>"]
|
||||||
license = "MIT/Apache-2.0"
|
license = "MIT/Apache-2.0"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
|
@ -12,8 +12,8 @@ Windows named pipe bindings for tokio.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tokio-core = "0.1"
|
mio = "0.6"
|
||||||
tokio-io = "0.1"
|
tokio = "0.1"
|
||||||
mio-named-pipes = { git = "https://github.com/alexcrichton/mio-named-pipes" }
|
mio-named-pipes = { git = "https://github.com/alexcrichton/mio-named-pipes" }
|
||||||
futures = "0.1"
|
futures = "0.1"
|
||||||
bytes = "0.4"
|
bytes = "0.4"
|
100
src/lib.rs
100
src/lib.rs
|
@ -1,138 +1,110 @@
|
||||||
#![cfg(windows)]
|
#![cfg(windows)]
|
||||||
|
|
||||||
extern crate tokio_core;
|
extern crate tokio;
|
||||||
extern crate tokio_io;
|
|
||||||
extern crate bytes;
|
extern crate bytes;
|
||||||
|
extern crate mio;
|
||||||
extern crate mio_named_pipes;
|
extern crate mio_named_pipes;
|
||||||
extern crate futures;
|
extern crate futures;
|
||||||
|
|
||||||
use std::ffi::OsStr;
|
use std::ffi::OsStr;
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
use std::io::{self, Read, Write};
|
use std::io::{Read, Write};
|
||||||
use std::os::windows::io::*;
|
use std::os::windows::io::*;
|
||||||
|
|
||||||
use futures::{Async, Poll};
|
use futures::{Async, Poll};
|
||||||
|
|
||||||
#[allow(deprecated)]
|
|
||||||
use tokio_core::io::Io;
|
|
||||||
use bytes::{BufMut, Buf};
|
use bytes::{BufMut, Buf};
|
||||||
|
use mio::Ready;
|
||||||
use tokio_core::reactor::{PollEvented, Handle};
|
use tokio::reactor::{PollEvented2};
|
||||||
|
use tokio::io::{AsyncRead, AsyncWrite};
|
||||||
use tokio_io::{AsyncRead, AsyncWrite};
|
|
||||||
|
|
||||||
pub struct NamedPipe {
|
pub struct NamedPipe {
|
||||||
io: PollEvented<mio_named_pipes::NamedPipe>,
|
io: PollEvented2<mio_named_pipes::NamedPipe>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl NamedPipe {
|
impl NamedPipe {
|
||||||
pub fn new<P: AsRef<OsStr>>(p: P, handle: &Handle) -> io::Result<NamedPipe> {
|
pub fn new<P: AsRef<OsStr>>(p: P) -> std::io::Result<NamedPipe> {
|
||||||
NamedPipe::_new(p.as_ref(), handle)
|
NamedPipe::_new(p.as_ref())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn _new(p: &OsStr, handle: &Handle) -> io::Result<NamedPipe> {
|
fn _new(p: &OsStr) -> std::io::Result<NamedPipe> {
|
||||||
let inner = try!(mio_named_pipes::NamedPipe::new(p));
|
let inner = try!(mio_named_pipes::NamedPipe::new(p));
|
||||||
NamedPipe::from_pipe(inner, handle)
|
NamedPipe::from_pipe(inner)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn from_pipe(pipe: mio_named_pipes::NamedPipe,
|
pub fn from_pipe(pipe: mio_named_pipes::NamedPipe)
|
||||||
handle: &Handle)
|
-> std::io::Result<NamedPipe> {
|
||||||
-> io::Result<NamedPipe> {
|
|
||||||
Ok(NamedPipe {
|
Ok(NamedPipe {
|
||||||
io: try!(PollEvented::new(pipe, handle)),
|
io: PollEvented2::new(pipe),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn connect(&self) -> io::Result<()> {
|
pub fn connect(&self) -> std::io::Result<()> {
|
||||||
self.io.get_ref().connect()
|
self.io.get_ref().connect()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn disconnect(&self) -> io::Result<()> {
|
pub fn disconnect(&self) -> std::io::Result<()> {
|
||||||
self.io.get_ref().disconnect()
|
self.io.get_ref().disconnect()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn poll_read(&self) -> Async<()> {
|
pub fn poll_read_ready_readable(&mut self) -> tokio::io::Result<Async<Ready>> {
|
||||||
self.io.poll_read()
|
self.io.poll_read_ready(Ready::readable())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn poll_write(&self) -> Async<()> {
|
pub fn poll_write_ready(&mut self) -> tokio::io::Result<Async<Ready>> {
|
||||||
self.io.poll_write()
|
self.io.poll_write_ready()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn io_mut(&mut self) -> &mut PollEvented<mio_named_pipes::NamedPipe> {
|
fn io_mut(&mut self) -> &mut PollEvented2<mio_named_pipes::NamedPipe> {
|
||||||
&mut self.io
|
&mut self.io
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Read for NamedPipe {
|
impl Read for NamedPipe {
|
||||||
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
|
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
|
||||||
self.io.read(buf)
|
self.io.read(buf)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Write for NamedPipe {
|
impl Write for NamedPipe {
|
||||||
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
|
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
|
||||||
self.io.write(buf)
|
self.io.write(buf)
|
||||||
}
|
}
|
||||||
fn flush(&mut self) -> io::Result<()> {
|
fn flush(&mut self) -> std::io::Result<()> {
|
||||||
self.io.flush()
|
self.io.flush()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(deprecated)]
|
|
||||||
impl Io for NamedPipe {
|
|
||||||
fn poll_read(&mut self) -> Async<()> {
|
|
||||||
<NamedPipe>::poll_read(self)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn poll_write(&mut self) -> Async<()> {
|
|
||||||
<NamedPipe>::poll_write(self)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> Read for &'a NamedPipe {
|
impl<'a> Read for &'a NamedPipe {
|
||||||
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
|
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
|
||||||
(&self.io).read(buf)
|
(&self.io).read(buf)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> Write for &'a NamedPipe {
|
impl<'a> Write for &'a NamedPipe {
|
||||||
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
|
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
|
||||||
(&self.io).write(buf)
|
(&self.io).write(buf)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn flush(&mut self) -> io::Result<()> {
|
fn flush(&mut self) -> std::io::Result<()> {
|
||||||
(&self.io).flush()
|
(&self.io).flush()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(deprecated)]
|
|
||||||
impl<'a> Io for &'a NamedPipe {
|
|
||||||
fn poll_read(&mut self) -> Async<()> {
|
|
||||||
<NamedPipe>::poll_read(self)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn poll_write(&mut self) -> Async<()> {
|
|
||||||
<NamedPipe>::poll_write(self)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
impl AsyncRead for NamedPipe {
|
impl AsyncRead for NamedPipe {
|
||||||
unsafe fn prepare_uninitialized_buffer(&self, _: &mut [u8]) -> bool {
|
unsafe fn prepare_uninitialized_buffer(&self, _: &mut [u8]) -> bool {
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_buf<B: BufMut>(&mut self, buf: &mut B) -> Poll<usize, io::Error> {
|
fn read_buf<B: BufMut>(&mut self, buf: &mut B) -> Poll<usize, std::io::Error> {
|
||||||
if let Async::NotReady = <NamedPipe>::poll_read(self) {
|
if let Async::NotReady = self.io.poll_read_ready(Ready::readable())? {
|
||||||
return Ok(Async::NotReady)
|
return Ok(Async::NotReady)
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut stack_buf = [0u8; 1024];
|
let mut stack_buf = [0u8; 1024];
|
||||||
let bytes_read = self.io_mut().read(&mut stack_buf);
|
let bytes_read = self.io_mut().read(&mut stack_buf);
|
||||||
match bytes_read {
|
match bytes_read {
|
||||||
Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
|
Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => {
|
||||||
self.io_mut().need_read();
|
self.io_mut().clear_read_ready(Ready::readable())?;
|
||||||
return Ok(Async::NotReady);
|
return Ok(Async::NotReady);
|
||||||
},
|
},
|
||||||
Err(e) => Err(e),
|
Err(e) => Err(e),
|
||||||
|
@ -145,19 +117,19 @@ impl AsyncRead for NamedPipe {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AsyncWrite for NamedPipe {
|
impl AsyncWrite for NamedPipe {
|
||||||
fn shutdown(&mut self) -> Poll<(), io::Error> {
|
fn shutdown(&mut self) -> Poll<(), std::io::Error> {
|
||||||
Ok(().into())
|
Ok(().into())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn write_buf<B: Buf>(&mut self, buf: &mut B) -> Poll<usize, io::Error> {
|
fn write_buf<B: Buf>(&mut self, buf: &mut B) -> Poll<usize, std::io::Error> {
|
||||||
if let Async::NotReady = <NamedPipe>::poll_write(self) {
|
if let Async::NotReady = self.io.poll_write_ready()? {
|
||||||
return Ok(Async::NotReady)
|
return Ok(Async::NotReady)
|
||||||
}
|
}
|
||||||
|
|
||||||
let bytes_wrt = self.io_mut().write(buf.bytes());
|
let bytes_wrt = self.io_mut().write(buf.bytes());
|
||||||
match bytes_wrt {
|
match bytes_wrt {
|
||||||
Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
|
Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => {
|
||||||
self.io_mut().need_write();
|
self.io_mut().clear_write_ready()?;
|
||||||
return Ok(Async::NotReady);
|
return Ok(Async::NotReady);
|
||||||
},
|
},
|
||||||
Err(e) => Err(e),
|
Err(e) => Err(e),
|
||||||
|
|
Loading…
Reference in New Issue