From c629ed492341673109b8ed2e01b96300c8d0b65f Mon Sep 17 00:00:00 2001 From: Max Audron Date: Thu, 23 Jan 2020 15:58:24 +0100 Subject: sort features --- Cargo.toml | 18 ++++++++++++------ src/bin/quassel-client.rs | 23 +++++++++++++++++++++++ src/lib.rs | 15 +++++++++++++++ src/main.rs | 33 --------------------------------- 4 files changed, 50 insertions(+), 39 deletions(-) create mode 100644 src/bin/quassel-client.rs create mode 100644 src/lib.rs delete mode 100644 src/main.rs diff --git a/Cargo.toml b/Cargo.toml index 82d22d4..ca03d3c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,22 +3,28 @@ name = "libquassel" version = "0.1.0" authors = ["Max Audron "] edition = "2018" +autobins = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] log = "0.4" -bytes = "0.5" byteorder = "1.3.2" +failure = "0.1" + +bytes = { version = "0.5", optional = true } flate2 = { version = "1.0", features = ["tokio"], optional = true } tokio = { version = "0.2", features = ["full"], optional = true } tokio-util = { version = "0.2", features = ["codec"], optional = true } -failure = "0.1" -futures-util = { version = "0.3", features = ["std"] } -futures = "0.3" +futures-util = { version = "0.3", features = ["std"], optional = true } +futures = { version = "0.3", optional = true } [features] -framing = ["tokio", "tokio-util", "flate2"] -client = ["tokio", "tokio-util", "framing", "futures-util"] +framing = ["tokio", "tokio-util", "flate2", "bytes"] +client = ["tokio", "tokio-util", "futures", "futures-util", "framing"] default = [] + +[[bin]] +name = "quassel-client" +required-features = ["client"] diff --git a/src/bin/quassel-client.rs b/src/bin/quassel-client.rs new file mode 100644 index 0000000..542d265 --- /dev/null +++ b/src/bin/quassel-client.rs @@ -0,0 +1,23 @@ +use failure::Error; + +extern crate libquassel; +use libquassel::client; + +#[macro_use] +extern crate tokio; + +#[tokio::main] +async fn main() -> Result<(), Error> { + + let mut client = client::Client::connect( + "localhost", + 4242, + false, + false, + ).await.unwrap(); + + client.run().await; +// client.login("audron", "audron", client_init); + + Ok(()) +} // the stream is closed here diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..8113481 --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,15 @@ +pub mod consts; +pub mod protocol; + +#[macro_use] +pub mod util; + +#[cfg(feature = "client")] +pub mod client; + +#[cfg(test)] +pub mod tests; + + +#[macro_use] +extern crate failure; diff --git a/src/main.rs b/src/main.rs deleted file mode 100644 index 5c34bae..0000000 --- a/src/main.rs +++ /dev/null @@ -1,33 +0,0 @@ -mod consts; - -#[cfg(features = "client")] -mod client; - -mod protocol; - -#[macro_use] -mod util; - -#[macro_use] -extern crate failure; - -#[cfg(test)] -mod tests; - -use failure::Error; - -#[tokio::main] -async fn main() -> Result<(), Error> { - - let mut client = client::Client::connect( - "localhost", - 4242, - false, - false, - ).await.unwrap(); - - client.run().await; -// client.login("audron", "audron", client_init); - - Ok(()) -} // the stream is closed here -- cgit v1.2.3