update tests; clippy warnings

src/context.rs

@@ -141,8 +141,8 @@ impl<A> HttpContext<A> where A: Actor<Context=Self> + Route {
 
     /// Returns drain future
     pub fn drain(&mut self) -> Drain<A> {
-        let fut = Rc::new(RefCell::new(DrainFut::new()));
+        let fut = Rc::new(RefCell::new(DrainFut::default()));
-        self.stream.push_back(Frame::Drain(fut.clone()));
+        self.stream.push_back(Frame::Drain(Rc::clone(&fut)));
         self.modified = true;
         Drain{ a: PhantomData, inner: fut }
     }

src/task.rs

@@ -66,14 +66,17 @@ pub struct DrainFut {
     task: Option<FutureTask>,
 }
 
-impl DrainFut {
+impl Default for DrainFut {
 
-    pub fn new() -> DrainFut {
+    fn default() -> DrainFut {
         DrainFut {
             drained: false,
             task: None,
         }
     }
+}
+
+impl DrainFut {
 
     fn set(&mut self) {
         self.drained = true;
@@ -319,8 +322,7 @@ impl Task {
         // response is completed
         if self.frames.is_empty() && self.iostate.is_done() {
             return Ok(Async::Ready(self.state.is_done()));
-        } else {
+        } else if self.drain.is_empty() {
-            if self.drain.is_empty() {
             // poll stream
             if self.state == TaskRunningState::Running {
                 match self.poll() {
@@ -369,7 +371,6 @@ impl Task {
                 }
             }
         }
-        }
 
         // write bytes to TcpStream
         if !self.disconnected {

src/ws.rs

@@ -344,7 +344,7 @@ mod tests {
         let req = HttpRequest::new(Method::GET, "/".to_owned(),
                                    Version::HTTP_11, HeaderMap::new(), String::new());
         match handshake(&req) {
-            Err(err) => assert_eq!(err.status(), StatusCode::METHOD_NOT_ALLOWED),
+            Err(err) => assert_eq!(err.status(), StatusCode::BAD_REQUEST),
             _ => panic!("should not happen"),
         }
 
@@ -354,7 +354,7 @@ mod tests {
         let req = HttpRequest::new(Method::GET, "/".to_owned(),
                                    Version::HTTP_11, headers, String::new());
         match handshake(&req) {
-            Err(err) => assert_eq!(err.status(), StatusCode::METHOD_NOT_ALLOWED),
+            Err(err) => assert_eq!(err.status(), StatusCode::BAD_REQUEST),
             _ => panic!("should not happen"),
         }
 

tests/test_httprequest.rs

@@ -73,7 +73,7 @@ fn test_request_query() {
 
     assert_eq!(req.query_string(), "id=test");
     let query = req.query();
-    assert_eq!(query.get("id").unwrap(), "test");
+    assert_eq!(&query["id"], "test");
 }
 
 #[test]