drop deprecated code

src/application.rs

@@ -6,7 +6,7 @@ use std::collections::HashMap;
 use handler::Reply;
 use router::{Router, Pattern};
 use resource::Resource;
-use headers::ContentEncoding;
+use header::ContentEncoding;
 use handler::{Handler, RouteHandler, WrapHandler};
 use httprequest::HttpRequest;
 use pipeline::{Pipeline, PipelineHandler};

src/client/pipeline.rs

@@ -11,7 +11,7 @@ use actix::prelude::*;
 use error::Error;
 use body::{Body, BodyStream};
 use context::{Frame, ActorHttpContext};
-use headers::ContentEncoding;
+use header::ContentEncoding;
 use httpmessage::HttpMessage;
 use error::PayloadError;
 use server::WriterState;

src/client/request.rs

@@ -449,7 +449,7 @@ impl ClientRequestBuilder {
     /// # use actix_web::*;
     /// # use actix_web::httpcodes::*;
     /// #
-    /// use actix_web::headers::Cookie;
+    /// use actix_web::header::Cookie;
     /// use actix_web::client::ClientRequest;
     ///
     /// fn main() {

src/httpresponse.rs

@@ -421,7 +421,7 @@ impl HttpResponseBuilder {
     /// # use actix_web::*;
     /// # use actix_web::httpcodes::*;
     /// #
-    /// use actix_web::headers::Cookie;
+    /// use actix_web::header::Cookie;
     ///
     /// fn index(req: HttpRequest) -> Result<HttpResponse> {
     ///     Ok(HttpOk.build()

src/lib.rs

@@ -139,7 +139,7 @@ pub use application::Application;
 pub use httpmessage::HttpMessage;
 pub use httprequest::HttpRequest;
 pub use httpresponse::HttpResponse;
-pub use handler::{Either, Responder, NormalizePath, AsyncResponder, FutureResponse};
+pub use handler::{Either, Responder, AsyncResponder, FutureResponse};
 pub use context::HttpContext;
 pub use server::HttpServer;
 pub use extractor::{Path, Query};
@@ -157,16 +157,6 @@ pub(crate) const HAS_TLS: bool = true;
 #[cfg(not(feature="tls"))]
 pub(crate) const HAS_TLS: bool = false;
 
-#[doc(hidden)]
-#[deprecated(since="0.4.4", note="please use `actix::header` module")]
-pub mod headers {
-    //! Headers implementation
-    pub use httpresponse::ConnectionType;
-    pub use cookie::{Cookie, CookieBuilder};
-    pub use http_range::HttpRange;
-    pub use header::ContentEncoding;
-}
-
 pub mod helpers {
     //! Various helpers
 

src/pipeline.rs

@@ -10,7 +10,7 @@ use futures::unsync::oneshot;
 use body::{Body, BodyStream};
 use context::{Frame, ActorHttpContext};
 use error::Error;
-use headers::ContentEncoding;
+use header::ContentEncoding;
 use handler::{Reply, ReplyItem};
 use httprequest::HttpRequest;
 use httpresponse::HttpResponse;

src/route.rs

@@ -79,12 +79,6 @@ impl<S: 'static> Route<S> {
         self
     }
 
-    #[doc(hidden)]
-    #[deprecated(since="0.4.1", note="please use `.filter()` instead")]
-    pub fn p<T: Predicate<S> + 'static>(&mut self, p: T) -> &mut Self {
-        self.filter(p)
-    }
-
     /// Set handler object. Usually call to this method is last call
     /// during route configuration, so it does not return reference to self.
     pub fn h<H: Handler<S>>(&mut self, handler: H) {

src/server/h1writer.rs

@@ -9,7 +9,7 @@ use http::{Method, Version};
 use http::header::{HeaderValue, CONNECTION, CONTENT_LENGTH, DATE};
 
 use body::{Body, Binary};
-use headers::ContentEncoding;
+use header::ContentEncoding;
 use httprequest::HttpInnerMessage;
 use httpresponse::HttpResponse;
 use super::helpers;

src/server/h2writer.rs

@@ -10,7 +10,7 @@ use http::{Version, HttpTryFrom, Response};
 use http::header::{HeaderValue, CONNECTION, TRANSFER_ENCODING, DATE, CONTENT_LENGTH};
 
 use body::{Body, Binary};
-use headers::ContentEncoding;
+use header::ContentEncoding;
 use httprequest::HttpInnerMessage;
 use httpresponse::HttpResponse;
 use super::helpers;

src/server/mod.rs

@@ -25,7 +25,7 @@ pub use self::settings::ServerSettings;
 
 use body::Binary;
 use error::Error;
-use headers::ContentEncoding;
+use header::ContentEncoding;
 use httprequest::{HttpInnerMessage, HttpRequest};
 use httpresponse::HttpResponse;
 

src/test.rs

@@ -133,48 +133,6 @@ impl TestServer {
         }
     }
 
-    #[deprecated(since="0.4.10",
-                 note="please use `TestServer::build_with_state()` instead")]
-    /// Start new test server with custom application state
-    ///
-    /// This method accepts state factory and configuration method.
-    pub fn with_state<S, FS, F>(state: FS, config: F) -> Self
-        where S: 'static,
-              FS: Sync + Send + 'static + Fn() -> S,
-              F: Sync + Send + 'static + Fn(&mut TestApp<S>),
-    {
-        let (tx, rx) = mpsc::channel();
-
-        // run server in separate thread
-        let join = thread::spawn(move || {
-            let sys = System::new("actix-test-server");
-
-            let tcp = net::TcpListener::bind("127.0.0.1:0").unwrap();
-            let local_addr = tcp.local_addr().unwrap();
-            let tcp = TcpListener::from_listener(tcp, &local_addr, Arbiter::handle()).unwrap();
-
-            HttpServer::new(move || {
-                let mut app = TestApp::new(state());
-                config(&mut app);
-                vec![app]}
-            ).disable_signals().start_incoming(tcp.incoming(), false);
-
-            tx.send((Arbiter::system(), local_addr)).unwrap();
-            let _ = sys.run();
-        });
-
-        let system = System::new("actix-test");
-        let (server_sys, addr) = rx.recv().unwrap();
-        TestServer {
-            addr,
-            server_sys,
-            system,
-            ssl: false,
-            conn: TestServer::get_conn(),
-            thread: Some(join),
-        }
-    }
-
     fn get_conn() -> Addr<Unsync, ClientConnector> {
         #[cfg(feature="alpn")]
         {

src/ws/client.rs

@@ -32,24 +32,6 @@ use super::frame::Frame;
 use super::proto::{CloseCode, OpCode};
 
 
-/// Backward compatibility
-#[doc(hidden)]
-#[deprecated(since="0.4.2", note="please use `ws::Client` instead")]
-pub type WsClient = Client;
-#[doc(hidden)]
-#[deprecated(since="0.4.2", note="please use `ws::ClientError` instead")]
-pub type WsClientError = ClientError;
-#[doc(hidden)]
-#[deprecated(since="0.4.2", note="please use `ws::ClientReader` instead")]
-pub type WsClientReader = ClientReader;
-#[doc(hidden)]
-#[deprecated(since="0.4.2", note="please use `ws::ClientWriter` instead")]
-pub type WsClientWriter = ClientWriter;
-#[doc(hidden)]
-#[deprecated(since="0.4.2", note="please use `ws::ClientHandshake` instead")]
-pub type WsClientHandshake = ClientHandshake;
-
-
 /// Websocket client error
 #[derive(Fail, Debug)]
 pub enum ClientError {

src/ws/mod.rs

@@ -70,18 +70,6 @@ pub use self::context::WebsocketContext;
 pub use self::client::{Client, ClientError,
                        ClientReader, ClientWriter, ClientHandshake};
 
-#[allow(deprecated)]
-pub use self::client::{WsClient, WsClientError,
-                       WsClientReader, WsClientWriter, WsClientHandshake};
-
-/// Backward compatibility
-#[doc(hidden)]
-#[deprecated(since="0.4.2", note="please use `ws::ProtocolError` instead")]
-pub type WsError = ProtocolError;
-#[doc(hidden)]
-#[deprecated(since="0.4.2", note="please use `ws::HandshakeError` instead")]
-pub type WsHandshakeError = HandshakeError;
-
 /// Websocket protocol errors
 #[derive(Fail, Debug)]
 pub enum ProtocolError {