minor: fix new clippy lint failures with rust 1.42.0

saghm · saghm · commit ff72557547ef · 2020-03-17T14:55:44.000-04:00
diff --git a/src/bson_util.rs b/src/bson_util.rs
@@ -27,7 +27,7 @@ pub(crate) fn to_bson_array(docs: &[Document]) -> Bson {
 
 #[cfg(test)]
 pub(crate) fn sort_document(document: &mut Document) {
-    let temp = std::mem::replace(document, Default::default());
+    let temp = std::mem::take(document);
 
     let mut elements: Vec<_> = temp.into_iter().collect();
     elements.sort_by(|e1, e2| e1.0.cmp(&e2.0));
diff --git a/src/client/auth/scram.rs b/src/client/auth/scram.rs
@@ -299,7 +299,7 @@ fn h_i<M: Mac + Sync>(str: &str, salt: &[u8], iterations: usize, output_size: us
 
 /// Parses a string slice of the form "<expected_key>=<body>" into "<body>", if possible.
 fn parse_kvp(str: &str, expected_key: char) -> Result<String> {
-    if str.chars().nth(0) != Some(expected_key) || str.chars().nth(1) != Some('=') {
+    if !str.starts_with(expected_key) || str.chars().nth(1) != Some('=') {
         Err(Error::invalid_authentication_response("SCRAM"))
     } else {
         Ok(str.chars().skip(2).collect())
@@ -569,7 +569,7 @@ impl ServerFinal {
 
         let first = message
             .chars()
-            .nth(0)
+            .next()
             .ok_or_else(|| Error::invalid_authentication_response("SCRAM"))?;
         let body = if first == ERROR_KEY {
             let error = parse_kvp(message, ERROR_KEY)?;
diff --git a/src/client/options/mod.rs b/src/client/options/mod.rs
@@ -839,7 +839,7 @@ impl ClientOptionsParser {
             }
         }
 
-        let db_str = db.as_ref().map(String::as_str);
+        let db_str = db.as_deref();
 
         match options.auth_mechanism {
             Some(ref mechanism) => {
diff --git a/src/is_master.rs b/src/is_master.rs
@@ -61,7 +61,7 @@ impl IsMasterCommandResponse {
     pub(crate) fn server_type(&self) -> ServerType {
         if self.ok != Some(1.0) {
             ServerType::Unknown
-        } else if self.msg.as_ref().map(String::as_str) == Some("isdbgrid") {
+        } else if self.msg.as_deref() == Some("isdbgrid") {
             ServerType::Mongos
         } else if self.set_name.is_some() {
             if let Some(true) = self.hidden {
diff --git a/src/sdam/public.rs b/src/sdam/public.rs
@@ -64,7 +64,7 @@ impl<'a> ServerInfo<'a> {
 
     /// Gets the name of the replica set that the server is part of.
     pub fn replica_set_name(&self) -> Option<&str> {
-        self.command_response_getter(|r| r.set_name.as_ref().map(String::as_str))
+        self.command_response_getter(|r| r.set_name.as_deref())
     }
 
     /// Gets the version of the replica set that the server is part of.

Original file line number	Diff line number	Diff line change
`@@ -839,7 +839,7 @@ impl ClientOptionsParser {`
`839`	`839`	`}`
`840`	`840`	`}`
`841`	`841`
`842`		`- let db_str = db.as_ref().map(String::as_str);`
	`842`	`+ let db_str = db.as_deref();`
`843`	`843`
`844`	`844`	`match options.auth_mechanism {`
`845`	`845`	`Some(ref mechanism) => {`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ impl<'a> ServerInfo<'a> {`
`64`	`64`
`65`	`65`	`/// Gets the name of the replica set that the server is part of.`
`66`	`66`	`pub fn replica_set_name(&self) -> Option<&str> {`
`67`		`- self.command_response_getter(\|r\| r.set_name.as_ref().map(String::as_str))`
	`67`	`+ self.command_response_getter(\|r\| r.set_name.as_deref())`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/// Gets the version of the replica set that the server is part of.`