Skip to content

Commit

Permalink
Merge pull request #22 from D1plo1d/tokio-0.2.0-alpha.2
Browse files Browse the repository at this point in the history
Bumped tokio to 0.2.0-alpha.2

Thanks @D1plo1d.  I'll be making a crates.io release soon.
  • Loading branch information
berkowski authored Aug 26, 2019
2 parents 93e91aa + 17b7a0a commit 1cc4b29
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tokio-serial"
version = "3.3.0-tokio-0.2.0-alpha.1"
version = "3.3.0-tokio-0.2.0-alpha.2"
authors = ["Zac Berkowitz <zac.berkowitz@gmail.com>"]
description = "A serial port implementation for tokio"
license = "MIT"
Expand All @@ -21,12 +21,12 @@ default = ["libudev"]
libudev = ["mio-serial/libudev"]

[dependencies]
tokio-io = "0.2.0-alpha.1"
tokio-reactor = "0.2.0-alpha.1"
tokio-io = "0.2.0-alpha.2"
tokio-net = "0.2.0-alpha.2"
bytes = "0.4"
mio = "0.6"
mio-serial = { version = "=3.3.0", default-features = false }

[dev-dependencies]
futures-preview = "=0.3.0-alpha.17"
tokio = "0.2.0-alpha.1"
futures-preview = "=0.3.0-alpha.18"
tokio = "0.2.0-alpha.2"
1 change: 1 addition & 0 deletions rust-toolchain
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nightly-2019-08-25
5 changes: 4 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ pub use mio_serial::{
pub type Result<T> = mio_serial::Result<T>;

use tokio_io::{AsyncRead, AsyncWrite};
use tokio_reactor::{Handle, PollEvented};
use tokio_net::{
util::PollEvented,
driver::Handle,
};

use std::io::{self, Read, Write};
use std::path::Path;
Expand Down

0 comments on commit 1cc4b29

Please sign in to comment.