Integrate clippy lint as a feature (#198)

Author: kyeah

Cargo.toml

@@ -23,6 +23,10 @@ semver = "0.5.0"
 separator = "0.3.1"
 time = "0.1.35"
 
+[dependencies.clippy]
+optional = true
+version = "*"
+
 [dependencies.openssl]
 optional = true
 version = "0.9.3"
@@ -41,3 +45,4 @@ version = "0.9.8"
 [features]
 default = []
 ssl = ["openssl"]
+lint = ["clippy"]

clippy.toml

@@ -0,0 +1 @@
+cyclomatic-complexity-threshold = 30

src/coll/batch.rs

@@ -84,14 +84,7 @@ impl From<WriteModel> for Batch {
                                        multi: true,
                                    }])
             }
-            WriteModel::ReplaceOne { filter, replacement: update, upsert } => {
-                Batch::Update(vec![UpdateModel {
-                                       filter: filter,
-                                       update: update,
-                                       upsert: upsert,
-                                       multi: false,
-                                   }])
-            }
+            WriteModel::ReplaceOne { filter, replacement: update, upsert } |
             WriteModel::UpdateOne { filter, update, upsert } => {
                 Batch::Update(vec![UpdateModel {
                                        filter: filter,
@@ -160,14 +153,7 @@ impl Batch {
             }
             Batch::Update(ref mut models) => {
                 match model {
-                    WriteModel::ReplaceOne { filter, replacement: update, upsert } => {
-                        models.push(UpdateModel {
-                            filter: filter,
-                            update: update,
-                            upsert: upsert,
-                            multi: false,
-                        })
-                    }
+                    WriteModel::ReplaceOne { filter, replacement: update, upsert } |
                     WriteModel::UpdateOne { filter, update, upsert } => {
                         models.push(UpdateModel {
                             filter: filter,

src/coll/mod.rs

@@ -45,8 +45,8 @@ impl Collection {
                write_concern: Option<WriteConcern>)
                -> Collection {
 
-        let rp = read_preference.unwrap_or(db.read_preference.to_owned());
-        let wc = write_concern.unwrap_or(db.write_concern.to_owned());
+        let rp = read_preference.unwrap_or_else(|| db.read_preference.to_owned());
+        let wc = write_concern.unwrap_or_else(|| db.write_concern.to_owned());
 
         if create {
             // Attempt to create the collection explicitly, or fail silently.
@@ -97,7 +97,7 @@ impl Collection {
                      options: Option<AggregateOptions>)
                      -> Result<Cursor> {
         let pipeline_map: Vec<_> = pipeline.into_iter()
-            .map(|bdoc| Bson::Document(bdoc))
+            .map(Bson::Document)
             .collect();
 
         let mut spec = doc! {
@@ -169,7 +169,7 @@ impl Collection {
         }
 
         let read_preference = options.and_then(|o| o.read_preference)
-            .unwrap_or(self.read_preference.clone());
+            .unwrap_or_else(|| self.read_preference.clone());
 
         let result = try!(self.db.command(spec, CommandType::Distinct, Some(read_preference)));
         match result.get("values") {
@@ -261,7 +261,7 @@ impl Collection {
         cmd = merge_options(cmd, options);
 
         let res = try!(self.db.command(cmd, cmd_type, None));
-        let wc = write_concern.unwrap_or(self.write_concern.clone());
+        let wc = write_concern.unwrap_or_else(|| self.write_concern.clone());
         try!(WriteException::validate_write_result(res.clone(), wc));
 
         let doc = match res.get("value") {
@@ -554,7 +554,7 @@ impl Collection {
               cmd_type: CommandType)
               -> Result<(Vec<Bson>, Option<BulkWriteException>)> {
 
-        let wc = write_concern.unwrap_or(self.write_concern.clone());
+        let wc = write_concern.unwrap_or_else(|| self.write_concern.clone());
 
         let mut converted_docs = Vec::new();
         let mut ids = Vec::new();
@@ -637,14 +637,14 @@ impl Collection {
                        docs: Vec<bson::Document>,
                        options: Option<InsertManyOptions>)
                        -> Result<InsertManyResult> {
-        let write_concern = options.as_ref().map(|opts| opts.write_concern.clone()).unwrap_or(None);
+        let write_concern = options.as_ref().map_or(None, |opts| opts.write_concern.clone());
 
         let (ids, exception) =
             try!(self.insert(docs, options, write_concern, CommandType::InsertMany));
 
         let mut map = BTreeMap::new();
-        for i in 0..ids.len() {
-            map.insert(i as i64, ids.get(i).unwrap().to_owned());
+        for (i, item) in ids.iter().enumerate() {
+            map.insert(i as i64, item.to_owned());
         }
 
         if let Some(ref exc) = exception {
@@ -664,7 +664,7 @@ impl Collection {
                    cmd_type: CommandType)
                    -> Result<BulkDeleteResult> {
 
-        let wc = write_concern.unwrap_or(self.write_concern.clone());
+        let wc = write_concern.unwrap_or_else(|| self.write_concern.clone());
 
         let mut deletes = Vec::new();
         for model in models {
@@ -739,7 +739,7 @@ impl Collection {
                    write_concern: Option<WriteConcern>,
                    cmd_type: CommandType)
                    -> Result<BulkUpdateResult> {
-        let wc = write_concern.unwrap_or(self.write_concern.clone());
+        let wc = write_concern.unwrap_or_else(|| self.write_concern.clone());
 
         let mut updates = Vec::new();
         for model in models {

src/coll/options.rs

@@ -246,7 +246,7 @@ impl From<FindOneAndDeleteOptions> for bson::Document {
             document.insert("writeConcern", Bson::Document(write_concern.to_bson()));
         }
 
-        return document;
+        document
     }
 }
 
@@ -293,7 +293,7 @@ impl From<FindOneAndUpdateOptions> for bson::Document {
             document.insert("writeConcern", Bson::Document(write_concern.to_bson()));
         }
 
-        return document;
+        document
     }
 }
 

src/cursor.rs

@@ -79,7 +79,7 @@ macro_rules! try_or_emit {
                         connection_string: $connstring,
                     });
 
-                    if let Err(_) = hook_result {
+                    if hook_result.is_err() {
                         return Err(Error::EventListenerError(Some(Box::new(e))));
                     }
                 }
@@ -227,10 +227,10 @@ impl Cursor {
         };
 
         // Set slave_ok flag based on the result from server selection.
-        let new_flags = if !slave_ok {
-            flags
-        } else {
+        let new_flags = if slave_ok {
             flags | flags::SLAVE_OK
+        } else {
+            flags
         };
 
         // Send read_preference to the server based on the result from server selection.
@@ -274,7 +274,7 @@ impl Cursor {
         let mut socket = stream.get_socket();
         let req_id = client.get_req_id();
 
-        let index = namespace.find('.').unwrap_or(namespace.len());
+        let index = namespace.find('.').unwrap_or_else(|| namespace.len());
         let db_name = String::from(&namespace[..index]);
         let coll_name = String::from(&namespace[index + 1..]);
         let cmd_name = cmd_type.to_str();
@@ -318,7 +318,7 @@ impl Cursor {
                 connection_string: connstring.clone(),
             });
 
-            if let Err(_) = hook_result {
+            if hook_result.is_err() {
                 return Err(Error::EventListenerError(None));
             }
         }
@@ -407,7 +407,7 @@ impl Cursor {
                                              self.batch_size,
                                              self.cursor_id);
 
-        let index = self.namespace.rfind('.').unwrap_or(self.namespace.len());
+        let index = self.namespace.rfind('.').unwrap_or_else(|| self.namespace.len());
         let db_name = String::from(&self.namespace[..index]);
         let cmd_name = String::from("get_more");
         let connstring = format!("{}", try!(socket.get_ref().peer_addr()));
@@ -421,7 +421,7 @@ impl Cursor {
                 connection_string: connstring.clone(),
             });
 
-            if let Err(_) = hook_result {
+            if hook_result.is_err() {
                 return Err(Error::EventListenerError(None));
             }
         }

src/db/mod.rs

@@ -169,8 +169,8 @@ impl ThreadedDatabase for Database {
             read_preference: Option<ReadPreference>,
             write_concern: Option<WriteConcern>)
             -> Database {
-        let rp = read_preference.unwrap_or(client.read_preference.to_owned());
-        let wc = write_concern.unwrap_or(client.write_concern.to_owned());
+        let rp = read_preference.unwrap_or_else(|| client.read_preference.to_owned());
+        let wc = write_concern.unwrap_or_else(|| client.write_concern.to_owned());
 
         Arc::new(DatabaseInner {
             name: String::from(name),

src/db/options.rs

@@ -78,7 +78,11 @@ impl From<CreateUserOptions> for Document {
             document.insert("customData", Bson::Document(custom_data));
         }
 
-        document.insert("roles", Role::to_bson_array(options.roles));
+        let roles_barr = options.roles.into_iter()
+            .map(|r| r.to_bson())
+            .collect();
+
+        document.insert("roles", Bson::Array(roles_barr));
 
         if let Some(write_concern) = options.write_concern {
             document.insert("writeConcern", Bson::Document(write_concern.to_bson()));

src/db/roles.rs

@@ -3,6 +3,7 @@ use std::string::ToString;
 
 use bson::Bson;
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum SingleDatabaseRole {
     Read,
     ReadWrite,
@@ -37,6 +38,7 @@ impl ToString for SingleDatabaseRole {
     }
 }
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum AllDatabaseRole {
     Read,
     ReadWrite,
@@ -57,6 +59,7 @@ impl ToString for AllDatabaseRole {
     }
 }
 
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Role {
     All(AllDatabaseRole),
     Single {
@@ -65,19 +68,26 @@ pub enum Role {
     },
 }
 
-impl Role {
-    fn to_bson(&self) -> Bson {
-        match *self {
-            Role::All(ref role) => Bson::String(role.to_string()),
-            Role::Single { ref role, ref db } => {
-                Bson::Document(doc! {
-                "role" => (Bson::String(role.to_string())),
-                "db" => (Bson::String(db.to_owned()))
-            })
+impl From<Role> for Bson {
+    fn from(role: Role) -> Bson {
+        match role {
+            Role::All(role) => Bson::String(role.to_string()),
+            Role::Single { role, db } => {
+              Bson::Document(doc! {
+                  "role" => (Bson::String(role.to_string())),
+                  "db" => (Bson::String(db))
+              })
             }
         }
     }
+}
+
+impl Role {
+    pub fn to_bson(&self) -> Bson {
+        self.clone().into()
+    }
 
+    #[deprecated(since="0.2.4", note="this method will be removed in the next major release")]
     pub fn to_bson_array(vec: Vec<Role>) -> Bson {
         Bson::Array(vec.into_iter().map(|r| r.to_bson()).collect())
     }

src/gridfs/file.rs

@@ -288,18 +288,18 @@ impl File {
     // Retrieves a binary file chunk and asynchronously pre-loads the next chunk.
     fn get_chunk(&mut self) -> Result<Vec<u8>> {
         let id = self.doc.id.clone();
-        let chunk_num = self.chunk_num;
+        let curr_chunk_num = self.chunk_num;
 
         // Find the file chunk from the cache or from GridFS.
         let data = if let Some(lock) = self.rcache.take() {
             let cache = try!(lock.lock());
-            if cache.n == chunk_num && cache.err.is_none() {
+            if cache.n == curr_chunk_num && cache.err.is_none() {
                 cache.data.clone()
             } else {
-                try!(self.find_chunk(id, chunk_num))
+                try!(self.find_chunk(id, curr_chunk_num))
             }
         } else {
-            try!(self.find_chunk(id, chunk_num))
+            try!(self.find_chunk(id, curr_chunk_num))
         };
 
         self.chunk_num += 1;
@@ -311,7 +311,7 @@ impl File {
             let arc_cache = cache.clone();
             let arc_gfs = self.gfs.clone();
             let id = self.doc.id.clone();
-            let chunk_num = self.chunk_num;
+            let next_chunk_num = self.chunk_num;
 
             thread::spawn(move || {
                 let mut cache = match arc_cache.lock() {
@@ -323,7 +323,7 @@ impl File {
                 };
 
                 let result = arc_gfs.chunks
-                    .find_one(Some(doc!{"files_id" => (id), "n" => (chunk_num)}), None);
+                    .find_one(Some(doc!{"files_id" => (id), "n" => (next_chunk_num)}), None);
 
                 match result {
                     Ok(Some(doc)) => {
@@ -387,7 +387,7 @@ impl io::Write for File {
             self.wbuf.extend(part1.iter().cloned());
             data = part2;
 
-            let chunk_num = self.chunk_num;
+            let curr_chunk_num = self.chunk_num;
             self.chunk_num += 1;
             self.wsum.input(buf);
 
@@ -408,7 +408,7 @@ impl io::Write for File {
 
             // Flush chunk to GridFS
             let chunk = self.wbuf.clone();
-            try!(self.insert_chunk(chunk_num, &chunk));
+            try!(self.insert_chunk(curr_chunk_num, &chunk));
             self.wbuf.clear();
         }
 
@@ -417,7 +417,7 @@ impl io::Write for File {
             let size = cmp::min(chunk_size, data.len());
             let (part1, part2) = data.split_at(size);
 
-            let chunk_num = self.chunk_num;
+            let curr_chunk_num = self.chunk_num;
             self.chunk_num += 1;
             self.wsum.input(buf);
 
@@ -436,7 +436,7 @@ impl io::Write for File {
                 }
             }
 
-            try!(self.insert_chunk(chunk_num, part1));
+            try!(self.insert_chunk(curr_chunk_num, part1));
             data = part2;
         }
 
@@ -521,7 +521,7 @@ impl io::Read for File {
         let mut new_rbuf = Vec::with_capacity(self.rbuf.len() - i);
         {
             let (_, p2) = self.rbuf.split_at(i);
-            let b: Vec<u8> = p2.iter().cloned().collect();
+            let b: Vec<u8> = p2.to_vec();
             new_rbuf.extend(b);
         }