Update to use clippy 1.67 in CI (#810)

Author: attila-lin

.evergreen/check-clippy.sh

@@ -6,7 +6,7 @@ source ./.evergreen/configure-rust.sh
 source ./.evergreen/feature-combinations.sh
 
 # Pin clippy to the latest version. This should be updated when new versions of Rust are released.
-CLIPPY_VERSION=1.65.0
+CLIPPY_VERSION=1.67.0
 
 rustup install $CLIPPY_VERSION
 

clippy.toml

@@ -0,0 +1 @@
+msrv = "1.57"

src/client/options/test.rs

@@ -204,7 +204,7 @@ async fn run_connection_string_spec_tests() {
 }
 
 async fn parse_uri(option: &str, suggestion: Option<&str>) {
-    match ConnectionString::parse(&format!("mongodb://host:27017/?{}=test", option))
+    match ConnectionString::parse(format!("mongodb://host:27017/?{}=test", option))
         .map_err(|e| *e.kind)
     {
         Ok(_) => panic!("expected error for option {}", option),

src/gridfs/download.rs

@@ -192,7 +192,7 @@ impl GridFsBucket {
         if n != file.n() {
             return Err(ErrorKind::GridFs(GridFsErrorKind::WrongNumberOfChunks {
                 actual_number: n,
-                expected_number: file.n() as u32,
+                expected_number: file.n(),
             })
             .into());
         }

src/lib.rs

@@ -335,14 +335,16 @@ pub(crate) mod runtime;
 mod sdam;
 mod selection_criteria;
 mod srv;
-#[cfg(feature = "tracing-unstable")]
-mod trace;
 #[cfg(any(feature = "sync", feature = "tokio-sync", docsrs))]
 #[cfg_attr(docsrs, doc(cfg(any(feature = "sync", feature = "tokio-sync"))))]
 pub mod sync;
 #[cfg(test)]
 mod test;
+#[cfg(feature = "tracing-unstable")]
+mod trace;
 
+#[cfg(feature = "in-use-encryption-unstable")]
+pub use crate::client::csfle::client_encryption;
 pub use crate::{
     client::{session::ClientSession, Client},
     coll::Collection,
@@ -351,11 +353,9 @@ pub use crate::{
         Cursor,
     },
     db::Database,
-    gridfs::{GridFsDownloadStream, GridFsBucket, GridFsUploadStream},
+    gridfs::{GridFsBucket, GridFsDownloadStream, GridFsUploadStream},
 };
 #[cfg(feature = "in-use-encryption-unstable")]
-pub use crate::client::csfle::client_encryption;
-#[cfg(feature = "in-use-encryption-unstable")]
 pub use ::mongocrypt;
 
 pub use {client::session::ClusterTime, coll::Namespace, index::IndexModel, sdam::public::*};

src/runtime/tls_rustls.rs

@@ -1,7 +1,7 @@
 use std::{
     convert::TryFrom,
     fs::File,
-    io::{BufReader, Seek, SeekFrom},
+    io::{BufReader, Seek},
     pin::Pin,
     sync::Arc,
     task::{Context, Poll},
@@ -139,7 +139,7 @@ fn make_rustls_config(cfg: TlsOptions) -> Result<rustls::ClientConfig> {
             }
         };
 
-        file.seek(SeekFrom::Start(0))?;
+        file.rewind()?;
         let key = loop {
             match read_one(&mut file) {
                 Ok(Some(Item::PKCS8Key(bytes))) | Ok(Some(Item::RSAKey(bytes))) => {

src/sdam/description/topology/server_selection/mod.rs

@@ -129,9 +129,9 @@ impl TopologyDescription {
         self.servers.values().any(|server| server.is_available())
     }
 
-    fn suitable_servers<'a>(
+    fn suitable_servers(
         &self,
-        read_preference: &'a ReadPreference,
+        read_preference: &ReadPreference,
     ) -> Result<Vec<&ServerDescription>> {
         let servers = match self.topology_type {
             TopologyType::Unknown => Vec::new(),
@@ -145,10 +145,7 @@ impl TopologyDescription {
         Ok(servers)
     }
 
-    fn retain_servers_within_latency_window<'a>(
-        &self,
-        suitable_servers: &mut Vec<&'a ServerDescription>,
-    ) {
+    fn retain_servers_within_latency_window(&self, suitable_servers: &mut Vec<&ServerDescription>) {
         let shortest_average_rtt = suitable_servers
             .iter()
             .filter_map(|server_desc| server_desc.average_round_trip_time)
@@ -189,9 +186,9 @@ impl TopologyDescription {
         self.servers_with_type(&[ServerType::RsPrimary]).next()
     }
 
-    fn suitable_servers_in_replica_set<'a>(
+    fn suitable_servers_in_replica_set(
         &self,
-        read_preference: &'a ReadPreference,
+        read_preference: &ReadPreference,
     ) -> Result<Vec<&ServerDescription>> {
         let servers = match read_preference {
             ReadPreference::Primary => self.servers_with_type(&[ServerType::RsPrimary]).collect(),
@@ -234,10 +231,10 @@ impl TopologyDescription {
         Ok(servers)
     }
 
-    fn suitable_servers_for_read_preference<'a>(
+    fn suitable_servers_for_read_preference(
         &self,
         types: &'static [ServerType],
-        tag_sets: Option<&'a Vec<TagSet>>,
+        tag_sets: Option<&Vec<TagSet>>,
         max_staleness: Option<Duration>,
     ) -> Result<Vec<&ServerDescription>> {
         if let Some(max_staleness) = max_staleness {

src/sdam/monitor.rs

@@ -303,6 +303,7 @@ impl Monitor {
     {
         if let Some(ref emitter) = self.sdam_event_emitter {
             // We don't care about ordering or waiting for the event to have been received.
+            #[allow(clippy::let_underscore_future)]
             let _ = emitter.emit(event());
         }
     }

src/sdam/topology.rs

@@ -719,6 +719,7 @@ impl TopologyWorker {
 
     fn emit_event(&self, make_event: impl FnOnce() -> SdamEvent) {
         if let Some(ref emitter) = self.event_emitter {
+            #[allow(clippy::let_underscore_future)]
             let _ = emitter.emit(make_event());
         }
     }

src/test/csfle.rs

@@ -203,7 +203,9 @@ async fn custom_key_material() -> Result<()> {
 
     let key = base64::decode(
         "xPTAjBRG5JiPm+d3fj6XLi2q5DMXUS/f1f+SMAlhhwkhDRL0kr8r9GDLIGTAGlvC+HVjSIgdL+RKw\
-         ZCvpXSyxTICWSXTUYsWYPyu3IoHbuBZdmw2faM3WhcRIgbMReU5").unwrap();
+         ZCvpXSyxTICWSXTUYsWYPyu3IoHbuBZdmw2faM3WhcRIgbMReU5",
+    )
+    .unwrap();
     let id = enc
         .create_data_key(MasterKey::Local)
         .key_material(key)