Fix clippy warnings (#168)

async_ex2/src/appconfig.rs

@@ -1,4 +1,4 @@
-use actix_web::{error, web};
+use actix_web::web;
 
 use crate::handlers::{parts, products};
 

async_ex2/src/handlers/parts.rs

@@ -1,9 +1,5 @@
-use actix_multipart::{Field, Multipart, MultipartError};
+use actix_web::{web, Error, HttpResponse};
-use actix_web::{error, web, Error, HttpResponse};
+use futures::{future::ok as fut_ok, Future};
-use futures::{
-    future::{err as fut_err, ok as fut_ok, Either},
-    Future, Stream,
-};
 
 use crate::common::{Part, Product};
 

async_ex2/src/handlers/products.rs

@@ -1,9 +1,5 @@
-use actix_multipart::{Field, Multipart, MultipartError};
+use actix_web::{web, Error, HttpResponse};
-use actix_web::{error, web, Error, HttpResponse};
+use futures::{future::ok as fut_ok, Future};
-use futures::{
-    future::{err as fut_err, ok as fut_ok, Either},
-    Future, Stream,
-};
 
 use crate::common::{Part, Product};
 

basics/src/main.rs

@@ -132,7 +132,7 @@ fn main() -> io::Result<()> {
                     .route(
                         web::route()
                             .guard(guard::Not(guard::Get()))
-                            .to(|| HttpResponse::MethodNotAllowed()),
+                            .to(HttpResponse::MethodNotAllowed),
                     ),
             )
     })

cookie-auth/src/main.rs

@@ -3,7 +3,10 @@ use actix_identity::{CookieIdentityPolicy, IdentityService};
 use actix_web::{middleware, web, App, HttpResponse, HttpServer};
 
 fn index(id: Identity) -> String {
-    format!("Hello {}", id.identity().unwrap_or("Anonymous".to_owned()))
+    format!(
+        "Hello {}",
+        id.identity().unwrap_or_else(|| "Anonymous".to_owned())
+    )
 }
 
 fn login(id: Identity) -> HttpResponse {

jsonrpc/src/main.rs

@@ -86,7 +86,10 @@ fn rpc_select(
 
 pub trait ImplNetwork {
     fn ping(&self) -> String;
-    fn wait(&self, d: u64) -> Box<Future<Item = String, Error = Box<error::Error>>>;
+    fn wait(
+        &self,
+        d: u64,
+    ) -> Box<dyn Future<Item = String, Error = Box<dyn error::Error>>>;
 
     fn get(&self) -> u32;
     fn inc(&mut self);
@@ -107,9 +110,12 @@ impl ImplNetwork for ObjNetwork {
         String::from("pong")
     }
 
-    fn wait(&self, d: u64) -> Box<Future<Item = String, Error = Box<error::Error>>> {
+    fn wait(
+        &self,
+        d: u64,
+    ) -> Box<dyn Future<Item = String, Error = Box<dyn error::Error>>> {
         if let Err(e) = Delay::new(Duration::from_secs(d)).wait() {
-            let e: Box<error::Error> = Box::new(e);
+            let e: Box<dyn error::Error> = Box::new(e);
             return Box::new(future::err(e));
         };
         Box::new(future::ok(String::from("pong")))
@@ -126,11 +132,11 @@ impl ImplNetwork for ObjNetwork {
 
 #[derive(Clone)]
 pub struct AppState {
-    network: Arc<RwLock<ImplNetwork>>,
+    network: Arc<RwLock<dyn ImplNetwork>>,
 }
 
 impl AppState {
-    pub fn new(network: Arc<RwLock<ImplNetwork>>) -> Self {
+    pub fn new(network: Arc<RwLock<dyn ImplNetwork>>) -> Self {
         Self { network }
     }
 }

middleware/src/simple.rs

@@ -43,7 +43,7 @@ where
     type Request = ServiceRequest;
     type Response = ServiceResponse<B>;
     type Error = Error;
-    type Future = Box<Future<Item = Self::Response, Error = Self::Error>>;
+    type Future = Box<dyn Future<Item = Self::Response, Error = Self::Error>>;
 
     fn poll_ready(&mut self) -> Poll<(), Self::Error> {
         self.service.poll_ready()

state/src/main.rs

@@ -1,4 +1,4 @@
-#![cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
+#![allow(clippy::needless_pass_by_value)]
 //! Application may have multiple data objects that are shared across
 //! all handlers within same Application. Data could be added
 //! with `App::data()` method, multiple different data objects could be added.

template_askama/src/main.rs

@@ -17,7 +17,7 @@ struct Index;
 fn index(query: web::Query<HashMap<String, String>>) -> Result<HttpResponse> {
     let s = if let Some(name) = query.get("name") {
         UserTemplate {
-            name: name,
+            name,
             text: "Welcome!",
         }
         .render()

websocket-chat-broker/src/main.rs

@@ -68,7 +68,7 @@ impl WsChatSession {
     fn send_msg(&self, msg: &str) {
         let content = format!(
             "{}: {}",
-            self.name.clone().unwrap_or("anon".to_string()),
+            self.name.clone().unwrap_or_else(|| "anon".to_string()),
             msg
         );
         let msg = SendMessage(self.room.clone(), self.id, content);
@@ -87,7 +87,7 @@ impl Actor for WsChatSession {
     fn stopped(&mut self, _ctx: &mut Self::Context) {
         info!(
             "WsChatSession closed for {}({}) in room {}",
-            self.name.clone().unwrap_or("anon".to_string()),
+            self.name.clone().unwrap_or_else(|| "anon".to_string()),
             self.id,
             self.room
         );

websocket-chat-broker/src/server.rs

@@ -42,7 +42,7 @@ impl WsChatServer {
         id: Option<usize>,
         client: Client,
     ) -> usize {
-        let mut id = id.unwrap_or_else(|| rand::random::<usize>());
+        let mut id = id.unwrap_or_else(rand::random::<usize>);
         if let Some(room) = self.rooms.get_mut(room_name) {
             loop {
                 if room.contains_key(&id) {
@@ -94,7 +94,7 @@ impl Handler<JoinRoom> for WsChatServer {
         let id = self.add_client_to_room(&room_name, None, client);
         let join_msg = format!(
             "{} joined {}",
-            client_name.unwrap_or("anon".to_string()),
+            client_name.unwrap_or_else(|| "anon".to_string()),
             room_name
         );
         self.send_chat_message(&room_name, &join_msg, id);

websocket-chat/src/main.rs

@@ -164,7 +164,7 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsChatSession {
                     // send message to chat server
                     self.addr.do_send(server::ClientMessage {
                         id: self.id,
-                        msg: msg,
+                        msg,
                         room: self.room.clone(),
                     })
                 }

websocket-chat/src/server.rs

@@ -68,7 +68,7 @@ impl Default for ChatServer {
 
         ChatServer {
             sessions: HashMap::new(),
-            rooms: rooms,
+            rooms,
             rng: rand::thread_rng(),
         }
     }

websocket-tcp-chat/src/client.rs

@@ -154,7 +154,7 @@ impl StreamHandler<codec::ChatResponse, io::Error> for ChatClient {
                 for room in rooms {
                     println!("{}", room);
                 }
-                println!("");
+                println!();
             }
             _ => (),
         }

websocket-tcp-chat/src/main.rs

@@ -171,7 +171,7 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsChatSession {
                     // send message to chat server
                     self.addr.do_send(server::Message {
                         id: self.id,
-                        msg: msg,
+                        msg,
                         room: self.room.clone(),
                     })
                 }
@@ -212,7 +212,7 @@ impl WsChatSession {
 }
 
 fn main() -> std::io::Result<()> {
-    let _ = env_logger::init();
+    env_logger::init();
     let sys = actix::System::new("websocket-example");
 
     // Start chat server actor

websocket-tcp-chat/src/server.rs

@@ -66,7 +66,7 @@ impl Default for ChatServer {
 
         ChatServer {
             sessions: HashMap::new(),
-            rooms: rooms,
+            rooms,
             rng: rand::thread_rng(),
         }
     }

websocket-tcp-chat/src/session.rs

@@ -138,10 +138,10 @@ impl ChatSession {
     ) -> ChatSession {
         ChatSession {
             id: 0,
-            addr: addr,
+            addr,
             hb: Instant::now(),
             room: "Main".to_owned(),
-            framed: framed,
+            framed,
         }
     }
 
@@ -187,10 +187,8 @@ impl TcpServer {
         // implement stream handler `StreamHandler<(TcpStream,
         // net::SocketAddr), io::Error>`
         TcpServer::create(|ctx| {
-            ctx.add_message_stream(
+            ctx.add_message_stream(listener.incoming().map_err(|_| ()).map(TcpConnect));
-                listener.incoming().map_err(|_| ()).map(|s| TcpConnect(s)),
+            TcpServer { chat }
-            );
-            TcpServer { chat: chat }
         });
     }
 }

websocket/src/client.rs

@@ -18,7 +18,7 @@ use futures::{
 
 fn main() {
     ::std::env::set_var("RUST_LOG", "actix_web=info");
-    let _ = env_logger::init();
+    env_logger::init();
     let sys = actix::System::new("ws-example");
 
     Arbiter::spawn(lazy(|| {
@@ -27,7 +27,6 @@ fn main() {
             .connect()
             .map_err(|e| {
                 println!("Error: {}", e);
-                ()
             })
             .map(|(response, framed)| {
                 println!("{:?}", response);
@@ -46,8 +45,6 @@ fn main() {
                     }
                     addr.do_send(ClientCommand(cmd));
                 });
-
-                ()
             })
     }));
 
@@ -113,9 +110,8 @@ where
     T: AsyncRead + AsyncWrite,
 {
     fn handle(&mut self, msg: Frame, _ctx: &mut Context<Self>) {
-        match msg {
+        if let Frame::Text(txt) = msg {
-            Frame::Text(txt) => println!("Server: {:?}", txt),
+            println!("Server: {:?}", txt)
-            _ => (),
         }
     }