minor: fix clippy errors (#195)

mongodb · Jun 8, 2020 · 991bb40 · 991bb40
1 parent 3323ed8
commit 991bb40
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 18 deletions.
diff --git a/src/client/auth/scram.rs b/src/client/auth/scram.rs
@@ -261,7 +261,7 @@ fn xor(lhs: &[u8], rhs: &[u8]) -> Vec<u8> {
 
     lhs.iter()
         .zip(rhs.iter())
-        .map(|(l, r)| l.bitxor(r.clone()))
+        .map(|(l, r)| l.bitxor(r))
         .collect()
 }
 

diff --git a/src/client/options/mod.rs b/src/client/options/mod.rs
@@ -1466,7 +1466,7 @@ impl ClientOptionsParser {
                         option
                     ));
                 }
-                return Err(ErrorKind::ArgumentError { message: message }.into());
+                return Err(ErrorKind::ArgumentError { message }.into());
             }
         }
 

diff --git a/src/cmap/conn/wire/header.rs b/src/cmap/conn/wire/header.rs
@@ -50,11 +50,15 @@ impl Header {
 
     /// Reads bytes from `r` and deserializes them into a header.
     pub(crate) async fn read_from(stream: &mut AsyncStream) -> Result<Self> {
+        let length = stream.read_i32().await?;
+        let request_id = stream.read_i32().await?;
+        let response_to = stream.read_i32().await?;
+        let op_code = OpCode::from_i32(stream.read_i32().await?)?;
         Ok(Self {
-            length: stream.read_i32().await?,
-            request_id: stream.read_i32().await?,
-            response_to: stream.read_i32().await?,
-            op_code: OpCode::from_i32(stream.read_i32().await?)?,
+            length,
+            request_id,
+            response_to,
+            op_code,
         })
     }
 }
diff --git a/src/concern/mod.rs b/src/concern/mod.rs
@@ -179,7 +179,7 @@ impl Serialize for Acknowledgment {
     {
         match self {
             Acknowledgment::Majority => serializer.serialize_str("majority"),
-            Acknowledgment::Nodes(n) => serializer.serialize_i32(n.clone()),
+            Acknowledgment::Nodes(n) => serializer.serialize_i32(*n),
             Acknowledgment::Custom(name) => serializer.serialize_str(name),
         }
     }

diff --git a/src/operation/mod.rs b/src/operation/mod.rs
@@ -188,8 +188,6 @@ struct CursorInfo {
 
 #[cfg(test)]
 mod test {
-    use std::sync::Arc;
-
     use crate::{
         operation::Operation,
         options::{ReadPreference, SelectionCriteria},
@@ -210,9 +208,5 @@ mod test {
 
         let op = constructor(Some(read_pref.clone()));
         assert_eq!(op.selection_criteria(), Some(&read_pref));
-
-        let predicate = SelectionCriteria::Predicate(Arc::new(|_| true));
-        let op = constructor(Some(predicate.clone()));
-        assert_eq!(op.selection_criteria(), Some(&predicate));
     }
 }
diff --git a/src/sdam/description/topology/server_selection/test.rs b/src/sdam/description/topology/server_selection/test.rs
@@ -100,25 +100,25 @@ fn convert_read_preference(test_read_pref: TestReadPreference) -> Option<ReadPre
         "Secondary" => ReadPreference::Secondary {
             options: ReadPreferenceOptions::builder()
                 .tag_sets(test_read_pref.tag_sets)
-                .max_staleness(max_staleness.clone())
+                .max_staleness(max_staleness)
                 .build(),
         },
         "PrimaryPreferred" => ReadPreference::PrimaryPreferred {
             options: ReadPreferenceOptions::builder()
                 .tag_sets(test_read_pref.tag_sets)
-                .max_staleness(max_staleness.clone())
+                .max_staleness(max_staleness)
                 .build(),
         },
         "SecondaryPreferred" => ReadPreference::SecondaryPreferred {
             options: ReadPreferenceOptions::builder()
                 .tag_sets(test_read_pref.tag_sets)
-                .max_staleness(max_staleness.clone())
+                .max_staleness(max_staleness)
                 .build(),
         },
         "Nearest" => ReadPreference::Nearest {
             options: ReadPreferenceOptions::builder()
                 .tag_sets(test_read_pref.tag_sets)
-                .max_staleness(max_staleness.clone())
+                .max_staleness(max_staleness)
                 .build(),
         },
         _ => panic!("invalid read preference: {:?}", test_read_pref),

diff --git a/src/selection_criteria.rs b/src/selection_criteria.rs
@@ -30,7 +30,6 @@ impl PartialEq for SelectionCriteria {
     fn eq(&self, other: &Self) -> bool {
         match (self, other) {
             (Self::ReadPreference(r1), Self::ReadPreference(r2)) => r1 == r2,
-            (Self::Predicate(p1), Self::Predicate(p2)) => Arc::ptr_eq(p1, p2),
             _ => false,
         }
     }