1
0
mirror of https://github.com/actix/actix-extras.git synced 2025-06-30 03:44:27 +02:00

Re-export actix dependency. Closes #260 (#264)

- Re-export actix's prelude into actix namespace
- Removing implicit dependency on root's actix module
This commit is contained in:
Douman
2018-05-31 20:43:14 +03:00
committed by GitHub
parent 77becb9bc0
commit 80965d7a9a
16 changed files with 50 additions and 34 deletions

View File

@ -1,8 +1,9 @@
//! Http server
extern crate actix;
use std::net::Shutdown;
use std::{io, time};
use actix;
use bytes::BytesMut;
use futures::{Async, Poll};
use tokio_io::{AsyncRead, AsyncWrite};
@ -42,9 +43,8 @@ pub(crate) const MAX_WRITE_BUFFER_SIZE: usize = 65_536;
/// This is shortcut for `server::HttpServer::new()` method.
///
/// ```rust
/// # extern crate actix;
/// # extern crate actix_web;
/// use actix::*;
/// use actix_web::actix::*;
/// use actix_web::{server, App, HttpResponse};
///
/// fn main() {

View File

@ -1,10 +1,12 @@
extern crate actix;
use std::rc::Rc;
use std::sync::{mpsc as sync_mpsc, Arc};
use std::time::Duration;
use std::{io, net, thread};
use actix::actors::signal;
use actix::prelude::*;
use self::actix::actors::signal;
use self::actix::prelude::*;
use futures::sync::mpsc;
use futures::{Future, Sink, Stream};
use mio;
@ -19,7 +21,7 @@ use native_tls::TlsAcceptor;
#[cfg(feature = "alpn")]
use openssl::ssl::{AlpnError, SslAcceptorBuilder};
use super::channel::{HttpChannel, WrapperStream};
use super::channel::{WrapperStream};
use super::settings::{ServerSettings, WorkerSettings};
use super::worker::{Conn, SocketInfo, StopWorker, StreamHandlerType, Worker};
use super::{IntoHttpHandler, IoStream, KeepAlive};
@ -405,8 +407,8 @@ impl<H: IntoHttpHandler> HttpServer<H> {
/// This method requires to run within properly configured `Actix` system.
///
/// ```rust
/// extern crate actix;
/// extern crate actix_web;
/// extern crate actix;
/// use actix_web::{server, App, HttpResponse};
///
/// fn main() {
@ -478,7 +480,6 @@ impl<H: IntoHttpHandler> HttpServer<H> {
///
/// ```rust,ignore
/// # extern crate futures;
/// # extern crate actix;
/// # extern crate actix_web;
/// # use futures::Future;
/// use actix_web::*;

View File

@ -1,3 +1,5 @@
extern crate actix;
use futures::sync::oneshot;
use futures::Future;
use net2::TcpStreamExt;
@ -21,8 +23,8 @@ use openssl::ssl::SslAcceptor;
#[cfg(feature = "alpn")]
use tokio_openssl::SslAcceptorExt;
use actix::msgs::StopArbiter;
use actix::*;
use self::actix::msgs::StopArbiter;
use self::actix::*;
use server::channel::HttpChannel;
use server::settings::WorkerSettings;