Skip to content

Commit adc440e

Browse files
minor: bump clippy to 1.65 (#387)
1 parent b202364 commit adc440e

File tree

6 files changed

+19
-22
lines changed

6 files changed

+19
-22
lines changed

.evergreen/check-clippy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -o errexit
55
. ~/.cargo/env
66

77
# Pin clippy to the latest version. This should be updated when new versions of Rust are released.
8-
CLIPPY_VERSION=1.63.0
8+
CLIPPY_VERSION=1.65.0
99

1010
rustup install $CLIPPY_VERSION
1111

src/raw/document_buf.rs

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl RawDocumentBuf {
7171
/// Creates a new, empty [`RawDocumentBuf`].
7272
pub fn new() -> RawDocumentBuf {
7373
let mut data = Vec::new();
74-
data.extend(&MIN_BSON_DOCUMENT_SIZE.to_le_bytes());
74+
data.extend(MIN_BSON_DOCUMENT_SIZE.to_le_bytes());
7575
data.push(0);
7676
Self { data }
7777
}
@@ -196,7 +196,7 @@ impl RawDocumentBuf {
196196
pub fn append(&mut self, key: impl AsRef<str>, value: impl Into<RawBson>) {
197197
fn append_string(doc: &mut RawDocumentBuf, value: &str) {
198198
doc.data
199-
.extend(&((value.as_bytes().len() + 1) as i32).to_le_bytes());
199+
.extend(((value.as_bytes().len() + 1) as i32).to_le_bytes());
200200
doc.data.extend(value.as_bytes());
201201
doc.data.push(0);
202202
}
@@ -220,7 +220,7 @@ impl RawDocumentBuf {
220220

221221
match value {
222222
RawBson::Int32(i) => {
223-
self.data.extend(&i.to_le_bytes());
223+
self.data.extend(i.to_le_bytes());
224224
}
225225
RawBson::String(s) => {
226226
append_string(self, s.as_str());
@@ -237,32 +237,31 @@ impl RawDocumentBuf {
237237
subtype: b.subtype,
238238
}
239239
.len();
240-
self.data.extend(&len.to_le_bytes());
240+
self.data.extend(len.to_le_bytes());
241241
self.data.push(b.subtype.into());
242242
if let BinarySubtype::BinaryOld = b.subtype {
243-
self.data.extend(&(len - 4).to_le_bytes())
243+
self.data.extend((len - 4).to_le_bytes())
244244
}
245245
self.data.extend(b.bytes);
246246
}
247247
RawBson::Boolean(b) => {
248-
let byte = if b { 1 } else { 0 };
249-
self.data.push(byte);
248+
self.data.push(b as u8);
250249
}
251250
RawBson::DateTime(dt) => {
252-
self.data.extend(&dt.timestamp_millis().to_le_bytes());
251+
self.data.extend(dt.timestamp_millis().to_le_bytes());
253252
}
254253
RawBson::DbPointer(dbp) => {
255254
append_string(self, dbp.namespace.as_str());
256-
self.data.extend(&dbp.id.bytes());
255+
self.data.extend(dbp.id.bytes());
257256
}
258257
RawBson::Decimal128(d) => {
259-
self.data.extend(&d.bytes());
258+
self.data.extend(d.bytes());
260259
}
261260
RawBson::Double(d) => {
262-
self.data.extend(&d.to_le_bytes());
261+
self.data.extend(d.to_le_bytes());
263262
}
264263
RawBson::Int64(i) => {
265-
self.data.extend(&i.to_le_bytes());
264+
self.data.extend(i.to_le_bytes());
266265
}
267266
RawBson::RegularExpression(re) => {
268267
append_cstring(self, re.pattern.as_str());
@@ -277,15 +276,15 @@ impl RawDocumentBuf {
277276
scope: &code_w_scope.scope,
278277
}
279278
.len();
280-
self.data.extend(&len.to_le_bytes());
279+
self.data.extend(len.to_le_bytes());
281280
append_string(self, code_w_scope.code.as_str());
282281
self.data.extend(code_w_scope.scope.into_bytes());
283282
}
284283
RawBson::Timestamp(ts) => {
285-
self.data.extend(&ts.to_le_i64().to_le_bytes());
284+
self.data.extend(ts.to_le_i64().to_le_bytes());
286285
}
287286
RawBson::ObjectId(oid) => {
288-
self.data.extend(&oid.bytes());
287+
self.data.extend(oid.bytes());
289288
}
290289
RawBson::Symbol(s) => {
291290
append_string(self, s.as_str());

src/ser/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@ pub(crate) fn serialize_bson<W: Write + ?Sized>(
134134
Bson::String(ref v) => write_string(writer, v),
135135
Bson::Array(ref v) => serialize_array(writer, v),
136136
Bson::Document(ref v) => v.to_writer(writer),
137-
Bson::Boolean(v) => writer
138-
.write_all(&[if v { 0x01 } else { 0x00 }])
139-
.map_err(From::from),
137+
Bson::Boolean(v) => writer.write_all(&[v as u8]).map_err(From::from),
140138
Bson::RegularExpression(Regex {
141139
ref pattern,
142140
ref options,

src/ser/raw/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl<'a> serde::Serializer for &'a mut Serializer {
121121
#[inline]
122122
fn serialize_bool(self, v: bool) -> Result<Self::Ok> {
123123
self.update_element_type(ElementType::Boolean)?;
124-
self.bytes.push(if v { 1 } else { 0 });
124+
self.bytes.push(v as u8);
125125
Ok(())
126126
}
127127

src/tests/modules/serializer_deserializer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ fn test_serialize_utc_date_time() {
322322
#[allow(unused)]
323323
let src = time::OffsetDateTime::from_unix_timestamp(1_286_705_410).unwrap();
324324
#[cfg(feature = "chrono-0_4")]
325-
let src = chrono::Utc.timestamp(1_286_705_410, 0);
325+
let src = chrono::Utc.timestamp_opt(1_286_705_410, 0).unwrap();
326326
let dst = vec![
327327
18, 0, 0, 0, 9, 107, 101, 121, 0, 208, 111, 158, 149, 43, 1, 0, 0, 0,
328328
];

src/tests/serde.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![allow(clippy::blacklisted_name)]
1+
#![allow(clippy::disallowed_names)]
22

33
use crate::{
44
bson,

0 commit comments

Comments
 (0)