Skip to content

Commit 991bb40

Browse files
minor: fix clippy errors (#195)
1 parent 3323ed8 commit 991bb40

File tree

7 files changed

+15
-18
lines changed

7 files changed

+15
-18
lines changed

src/client/auth/scram.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ fn xor(lhs: &[u8], rhs: &[u8]) -> Vec<u8> {
261261

262262
lhs.iter()
263263
.zip(rhs.iter())
264-
.map(|(l, r)| l.bitxor(r.clone()))
264+
.map(|(l, r)| l.bitxor(r))
265265
.collect()
266266
}
267267

src/client/options/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1466,7 +1466,7 @@ impl ClientOptionsParser {
14661466
option
14671467
));
14681468
}
1469-
return Err(ErrorKind::ArgumentError { message: message }.into());
1469+
return Err(ErrorKind::ArgumentError { message }.into());
14701470
}
14711471
}
14721472

src/cmap/conn/wire/header.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@ impl Header {
5050

5151
/// Reads bytes from `r` and deserializes them into a header.
5252
pub(crate) async fn read_from(stream: &mut AsyncStream) -> Result<Self> {
53+
let length = stream.read_i32().await?;
54+
let request_id = stream.read_i32().await?;
55+
let response_to = stream.read_i32().await?;
56+
let op_code = OpCode::from_i32(stream.read_i32().await?)?;
5357
Ok(Self {
54-
length: stream.read_i32().await?,
55-
request_id: stream.read_i32().await?,
56-
response_to: stream.read_i32().await?,
57-
op_code: OpCode::from_i32(stream.read_i32().await?)?,
58+
length,
59+
request_id,
60+
response_to,
61+
op_code,
5862
})
5963
}
6064
}

src/concern/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ impl Serialize for Acknowledgment {
179179
{
180180
match self {
181181
Acknowledgment::Majority => serializer.serialize_str("majority"),
182-
Acknowledgment::Nodes(n) => serializer.serialize_i32(n.clone()),
182+
Acknowledgment::Nodes(n) => serializer.serialize_i32(*n),
183183
Acknowledgment::Custom(name) => serializer.serialize_str(name),
184184
}
185185
}

src/operation/mod.rs

-6
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,6 @@ struct CursorInfo {
188188

189189
#[cfg(test)]
190190
mod test {
191-
use std::sync::Arc;
192-
193191
use crate::{
194192
operation::Operation,
195193
options::{ReadPreference, SelectionCriteria},
@@ -210,9 +208,5 @@ mod test {
210208

211209
let op = constructor(Some(read_pref.clone()));
212210
assert_eq!(op.selection_criteria(), Some(&read_pref));
213-
214-
let predicate = SelectionCriteria::Predicate(Arc::new(|_| true));
215-
let op = constructor(Some(predicate.clone()));
216-
assert_eq!(op.selection_criteria(), Some(&predicate));
217211
}
218212
}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -100,25 +100,25 @@ fn convert_read_preference(test_read_pref: TestReadPreference) -> Option<ReadPre
100100
"Secondary" => ReadPreference::Secondary {
101101
options: ReadPreferenceOptions::builder()
102102
.tag_sets(test_read_pref.tag_sets)
103-
.max_staleness(max_staleness.clone())
103+
.max_staleness(max_staleness)
104104
.build(),
105105
},
106106
"PrimaryPreferred" => ReadPreference::PrimaryPreferred {
107107
options: ReadPreferenceOptions::builder()
108108
.tag_sets(test_read_pref.tag_sets)
109-
.max_staleness(max_staleness.clone())
109+
.max_staleness(max_staleness)
110110
.build(),
111111
},
112112
"SecondaryPreferred" => ReadPreference::SecondaryPreferred {
113113
options: ReadPreferenceOptions::builder()
114114
.tag_sets(test_read_pref.tag_sets)
115-
.max_staleness(max_staleness.clone())
115+
.max_staleness(max_staleness)
116116
.build(),
117117
},
118118
"Nearest" => ReadPreference::Nearest {
119119
options: ReadPreferenceOptions::builder()
120120
.tag_sets(test_read_pref.tag_sets)
121-
.max_staleness(max_staleness.clone())
121+
.max_staleness(max_staleness)
122122
.build(),
123123
},
124124
_ => panic!("invalid read preference: {:?}", test_read_pref),

src/selection_criteria.rs

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ impl PartialEq for SelectionCriteria {
3030
fn eq(&self, other: &Self) -> bool {
3131
match (self, other) {
3232
(Self::ReadPreference(r1), Self::ReadPreference(r2)) => r1 == r2,
33-
(Self::Predicate(p1), Self::Predicate(p2)) => Arc::ptr_eq(p1, p2),
3433
_ => false,
3534
}
3635
}

0 commit comments

Comments
 (0)