Skip to content

Commit

Permalink
fix examples
Browse files Browse the repository at this point in the history
  • Loading branch information
fafhrd91 committed Dec 11, 2018
1 parent 4adbbad commit de66b5c
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 28 deletions.
10 changes: 10 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,13 @@ members = [
"actix-rt",
"actix-utils",
]

[dev-dependencies]
actix-service = "0.1.1"
actix-codec = "0.1.0"
actix-rt = { path="actix-rt" }
actix-server = { path="actix-server", features=["ssl"] }
env_logger = "0.5"
futures = "0.1.24"
openssl = { version="0.10" }
tokio-openssl = { version="0.3" }
7 changes: 1 addition & 6 deletions actix-connector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ssl = ["openssl", "tokio-openssl"]

[dependencies]
actix-service = "0.1.1"
actix-codec = { path = "../actix-codec" }
actix-codec = "0.1.0"
actix-rt = { path = "../actix-rt" }
futures = "0.1"
tokio-tcp = "0.1"
Expand All @@ -40,8 +40,3 @@ trust-dns-resolver = "^0.10.0"
# openssl
openssl = { version="0.10", optional = true }
tokio-openssl = { version="0.3", optional = true }

[profile.release]
lto = true
opt-level = 3
codegen-units = 1
5 changes: 0 additions & 5 deletions actix-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,3 @@ webpki-roots = { version = "0.15", optional = true }

[dev-dependencies]
env_logger = "0.5"

[profile.release]
lto = true
opt-level = 3
codegen-units = 1
7 changes: 1 addition & 6 deletions actix-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,10 @@ path = "src/lib.rs"

[dependencies]
actix-service = "0.1.1"
actix-codec = { path = "../actix-codec" }
actix-codec = "0.1.0"
actix-rt = { path = "../actix-rt" }

# io
bytes = "0.4"
futures = "0.1"
tokio-timer = "0.2.8"

[profile.release]
lto = true
opt-level = 3
codegen-units = 1
9 changes: 4 additions & 5 deletions examples/basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ use std::sync::{
};
use std::{env, fmt};

use actix_codec::{AsyncRead, AsyncWrite};
use actix_rt::System;
use actix_server::Server;
use actix_service::{IntoNewService, NewService};
use futures::{future, Future};
use openssl::ssl::{SslAcceptor, SslFiletype, SslMethod};
use tokio_io::{AsyncRead, AsyncWrite};
use tokio_openssl::SslAcceptorExt;

use actix_net::server::Server;
use actix_rt::System;
use actix_service::{IntoNewService, NewService};

/// Simple logger service, it just prints fact of the new connections
fn logger<T: AsyncRead + AsyncWrite + fmt::Debug>(
stream: T,
Expand Down
10 changes: 4 additions & 6 deletions examples/ssl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ use std::sync::{
Arc,
};

use futures::{future, Future};
use openssl::ssl::{SslAcceptor, SslFiletype, SslMethod};
use tokio_io::{AsyncRead, AsyncWrite};

use actix_net::server::Server;
use actix_net::ssl;
use actix_codec::{AsyncRead, AsyncWrite};
use actix_rt::System;
use actix_server::{ssl, Server};
use actix_service::NewService;
use futures::{future, Future};
use openssl::ssl::{SslAcceptor, SslFiletype, SslMethod};

#[derive(Debug)]
struct ServiceState {
Expand Down

0 comments on commit de66b5c

Please sign in to comment.