Skip to content

Commit 4050a43

Browse files
knutwalkerknutwalker
authored
Fix a few clippy warnings (#226)
* Elide lifetimes * Use one more implicit return * Reorder some trait impls according to their trait definition order * Use is_ok_and over map_or * Move to conditional import
1 parent 9c67cd4 commit 4050a43

File tree

10 files changed

+69
-69
lines changed

10 files changed

+69
-69
lines changed

‎lib/src/bolt/request/hello.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ enum ServerRouting<'a> {
9090
WithContext { context: Box<[(&'a str, &'a str)]> },
9191
}
9292

93-
impl<'a> ServerRouting<'a> {
93+
impl ServerRouting<'_> {
9494
fn is_none(&self) -> bool {
9595
matches!(self, ServerRouting::No)
9696
}
9797
}
9898

99-
impl<'a> Serialize for ServerRouting<'a> {
99+
impl Serialize for ServerRouting<'_> {
100100
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
101101
where
102102
S: serde::Serializer,
@@ -121,11 +121,11 @@ pub struct Response {
121121
pub(crate) connection_id: String,
122122
}
123123

124-
impl<'a> ExpectedResponse for Hello<'a> {
124+
impl ExpectedResponse for Hello<'_> {
125125
type Response = Summary<Response>;
126126
}
127127

128-
impl<'a> Serialize for Hello<'a> {
128+
impl Serialize for Hello<'_> {
129129
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
130130
where
131131
S: serde::Serializer,

‎lib/src/bolt/request/route.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub struct Response {
1010
pub rt: RoutingTable,
1111
}
1212

13-
impl<'a> ExpectedResponse for Route<'a> {
13+
impl ExpectedResponse for Route<'_> {
1414
type Response = Summary<Response>;
1515
}
1616

‎lib/src/bolt/structs/de.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ impl<'a, T> Single<'a, T> {
363363
}
364364
}
365365

366-
impl<'a, 'de, T: Deserialize<'de> + 'de> DeserializeSeed<'de> for Single<'a, T> {
366+
impl<'de, T: Deserialize<'de> + 'de> DeserializeSeed<'de> for Single<'_, T> {
367367
type Value = Option<T>;
368368

369369
fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
@@ -377,7 +377,7 @@ impl<'a, 'de, T: Deserialize<'de> + 'de> DeserializeSeed<'de> for Single<'a, T>
377377

378378
struct Filter<'a>(&'a str);
379379

380-
impl<'a, 'de> Visitor<'de> for Filter<'a> {
380+
impl<'de> Visitor<'de> for Filter<'_> {
381381
type Value = Key;
382382

383383
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -435,7 +435,7 @@ impl<'a, 'de, T: Deserialize<'de> + 'de> DeserializeSeed<'de> for Single<'a, T>
435435
}
436436
}
437437

438-
impl<'a, 'de> DeserializeSeed<'de> for Filter<'a> {
438+
impl<'de> DeserializeSeed<'de> for Filter<'_> {
439439
type Value = Key;
440440

441441
fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
@@ -448,7 +448,7 @@ impl<'a, 'de, T: Deserialize<'de> + 'de> DeserializeSeed<'de> for Single<'a, T>
448448

449449
struct Vis<'a, 'de, T>(&'a str, PhantomData<&'de T>);
450450

451-
impl<'a, 'de, T: Deserialize<'de> + 'de> Visitor<'de> for Vis<'a, 'de, T> {
451+
impl<'de, T: Deserialize<'de> + 'de> Visitor<'de> for Vis<'_, 'de, T> {
452452
type Value = Option<T>;
453453

454454
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

‎lib/src/bolt/structs/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub enum BoltRef<'de> {
5050
LegacyDateTimeZoneId(LegacyDateTimeZoneIdRef<'de>),
5151
}
5252

53-
impl<'de> From<()> for BoltRef<'de> {
53+
impl From<()> for BoltRef<'_> {
5454
fn from(_: ()) -> Self {
5555
Self::Null
5656
}

‎lib/src/bolt/structs/point.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ impl<'de> Deserialize<'de> for Crs {
275275
{
276276
struct Vis;
277277

278-
impl<'de> serde::de::Visitor<'de> for Vis {
278+
impl serde::de::Visitor<'_> for Vis {
279279
type Value = Crs;
280280

281281
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -418,12 +418,10 @@ impl<'de> Deserialize<'de> for Point {
418418
match tag {
419419
Some(0x58) => map.next_value::<Point2D>().map(|p| p.to_point()),
420420
Some(0x59) => map.next_value::<Point3D>().map(|p| p.to_point()),
421-
Some(tag) => {
422-
return Err(serde::de::Error::invalid_type(
423-
serde::de::Unexpected::Other(&format!("struct with tag {:02X}", tag)),
424-
&"a Bolt struct (tag {:02X})",
425-
))
426-
}
421+
Some(tag) => Err(serde::de::Error::invalid_type(
422+
serde::de::Unexpected::Other(&format!("struct with tag {:02X}", tag)),
423+
&"a Bolt struct (tag {:02X})",
424+
)),
427425
None => Err(serde::de::Error::missing_field("tag")),
428426
}
429427
}

‎lib/src/packstream/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl<'de> Deserialize<'de> for RawBytes {
6868
{
6969
struct RawBytesVisitor;
7070

71-
impl<'de> serde::de::Visitor<'de> for RawBytesVisitor {
71+
impl serde::de::Visitor<'_> for RawBytesVisitor {
7272
type Value = Bytes;
7373

7474
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {

‎lib/src/packstream/ser/map.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ use ::serde::ser::{
99
#[derive(Debug, PartialEq, Eq)]
1010
pub struct AsMap<'a, T: ?Sized>(pub &'a T);
1111

12-
impl<'a, T: ?Sized> Copy for AsMap<'a, T> {}
12+
impl<T: ?Sized> Copy for AsMap<'_, T> {}
1313

14-
impl<'a, T: ?Sized> Clone for AsMap<'a, T> {
14+
impl<T: ?Sized> Clone for AsMap<'_, T> {
1515
fn clone(&self) -> Self {
1616
*self
1717
}
1818
}
1919

20-
impl<'a, T: ?Sized + Serialize> Serialize for AsMap<'a, T> {
20+
impl<T: ?Sized + Serialize> Serialize for AsMap<'_, T> {
2121
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
2222
as_map(serializer, self.0)
2323
}
@@ -375,7 +375,7 @@ impl<S: SerializeMap> InnerMapSerializer<S> {
375375
}
376376
}
377377

378-
impl<'a, S: SerializeMap> Serializer for &'a mut InnerMapSerializer<S> {
378+
impl<S: SerializeMap> Serializer for &mut InnerMapSerializer<S> {
379379
type Ok = ();
380380
type Error = S::Error;
381381

@@ -443,17 +443,17 @@ impl<'a, S: SerializeMap> Serializer for &'a mut InnerMapSerializer<S> {
443443
self.value(v)
444444
}
445445

446+
fn serialize_none(self) -> Result<Self::Ok, Self::Error> {
447+
Ok(())
448+
}
449+
446450
fn serialize_some<T>(self, value: &T) -> Result<Self::Ok, Self::Error>
447451
where
448452
T: Serialize + ?Sized,
449453
{
450454
value.serialize(self)
451455
}
452456

453-
fn serialize_none(self) -> Result<Self::Ok, Self::Error> {
454-
Ok(())
455-
}
456-
457457
fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {
458458
Ok(())
459459
}
@@ -572,7 +572,7 @@ impl<'a, S: SerializeMap> Serializer for &'a mut InnerMapSerializer<S> {
572572
// }
573573
// }
574574

575-
impl<'a, S: SerializeMap> SerializeSeq for &'a mut InnerMapSerializer<S> {
575+
impl<S: SerializeMap> SerializeSeq for &mut InnerMapSerializer<S> {
576576
type Ok = ();
577577
type Error = S::Error;
578578

@@ -606,7 +606,7 @@ impl<'a, S: SerializeMap> SerializeSeq for &'a mut InnerMapSerializer<S> {
606606
// }
607607
// }
608608

609-
impl<'a, S: SerializeMap> SerializeTuple for &'a mut InnerMapSerializer<S> {
609+
impl<S: SerializeMap> SerializeTuple for &mut InnerMapSerializer<S> {
610610
type Ok = ();
611611
type Error = S::Error;
612612

@@ -640,7 +640,7 @@ impl<'a, S: SerializeMap> SerializeTuple for &'a mut InnerMapSerializer<S> {
640640
// }
641641
// }
642642

643-
impl<'a, S: SerializeMap> SerializeTupleStruct for &'a mut InnerMapSerializer<S> {
643+
impl<S: SerializeMap> SerializeTupleStruct for &mut InnerMapSerializer<S> {
644644
type Ok = ();
645645
type Error = S::Error;
646646

@@ -682,7 +682,7 @@ impl<'a, S: SerializeMap> SerializeTupleStruct for &'a mut InnerMapSerializer<S>
682682
// }
683683
// }
684684

685-
impl<'a, S: SerializeMap> SerializeMap for &'a mut InnerMapSerializer<S> {
685+
impl<S: SerializeMap> SerializeMap for &mut InnerMapSerializer<S> {
686686
type Ok = ();
687687
type Error = S::Error;
688688

@@ -725,7 +725,7 @@ impl<'a, S: SerializeMap> SerializeMap for &'a mut InnerMapSerializer<S> {
725725
// }
726726
// }
727727

728-
impl<'a, S: SerializeMap> SerializeTupleVariant for &'a mut InnerMapSerializer<S> {
728+
impl<S: SerializeMap> SerializeTupleVariant for &mut InnerMapSerializer<S> {
729729
type Ok = ();
730730
type Error = S::Error;
731731

@@ -762,7 +762,7 @@ impl<'a, S: SerializeMap> SerializeTupleVariant for &'a mut InnerMapSerializer<S
762762
// }
763763
// }
764764

765-
impl<'a, S: SerializeMap> SerializeStruct for &'a mut InnerMapSerializer<S> {
765+
impl<S: SerializeMap> SerializeStruct for &mut InnerMapSerializer<S> {
766766
type Ok = ();
767767
type Error = S::Error;
768768

@@ -798,7 +798,7 @@ impl<'a, S: SerializeMap> SerializeStruct for &'a mut InnerMapSerializer<S> {
798798
// }
799799
// }
800800

801-
impl<'a, S: SerializeMap> SerializeStructVariant for &'a mut InnerMapSerializer<S> {
801+
impl<S: SerializeMap> SerializeStructVariant for &mut InnerMapSerializer<S> {
802802
type Ok = ();
803803
type Error = S::Error;
804804

‎lib/src/packstream/ser/mod.rs

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ impl<'a> ser::Serializer for &'a mut Serializer {
344344
}
345345
}
346346

347-
impl<'a> ser::SerializeSeq for &'a mut Serializer {
347+
impl ser::SerializeSeq for &mut Serializer {
348348
type Ok = ();
349349
type Error = Error;
350350

@@ -360,7 +360,7 @@ impl<'a> ser::SerializeSeq for &'a mut Serializer {
360360
}
361361
}
362362

363-
impl<'a> ser::SerializeTuple for &'a mut Serializer {
363+
impl ser::SerializeTuple for &mut Serializer {
364364
type Ok = ();
365365
type Error = Error;
366366

@@ -376,7 +376,7 @@ impl<'a> ser::SerializeTuple for &'a mut Serializer {
376376
}
377377
}
378378

379-
impl<'a> ser::SerializeTupleStruct for &'a mut Serializer {
379+
impl ser::SerializeTupleStruct for &mut Serializer {
380380
type Ok = ();
381381
type Error = Error;
382382

@@ -401,37 +401,10 @@ pub(super) enum MapSerializer<'a> {
401401
},
402402
}
403403

404-
impl<'a> ser::SerializeMap for MapSerializer<'a> {
404+
impl ser::SerializeMap for MapSerializer<'_> {
405405
type Ok = ();
406406
type Error = Error;
407407

408-
fn serialize_entry<K, V>(&mut self, key: &K, value: &V) -> Result<(), Self::Error>
409-
where
410-
K: ser::Serialize + ?Sized,
411-
V: ser::Serialize + ?Sized,
412-
{
413-
if key.serialize(SpecialKeySerializer).is_ok() {
414-
match value.serialize(SpecialValueSerializer) {
415-
Ok(map_size) => match self {
416-
MapSerializer::Known(ser) => ser,
417-
MapSerializer::Unknown { ser, len, .. } => {
418-
let rhs = map_size as isize;
419-
let (res, overflowed) = len.overflowing_sub(rhs);
420-
let overflowed = overflowed ^ (rhs < 0);
421-
let res = if overflowed { isize::MIN } else { res };
422-
*len = res;
423-
ser
424-
}
425-
}
426-
.map_header(map_size),
427-
Err(_) => Err(Error::LengthOverflow),
428-
}
429-
} else {
430-
self.serialize_key(key)?;
431-
self.serialize_value(value)
432-
}
433-
}
434-
435408
fn serialize_key<T>(&mut self, key: &T) -> Result<(), Self::Error>
436409
where
437410
T: ser::Serialize + ?Sized,
@@ -459,6 +432,33 @@ impl<'a> ser::SerializeMap for MapSerializer<'a> {
459432
value.serialize(&mut **ser)
460433
}
461434

435+
fn serialize_entry<K, V>(&mut self, key: &K, value: &V) -> Result<(), Self::Error>
436+
where
437+
K: ser::Serialize + ?Sized,
438+
V: ser::Serialize + ?Sized,
439+
{
440+
if key.serialize(SpecialKeySerializer).is_ok() {
441+
match value.serialize(SpecialValueSerializer) {
442+
Ok(map_size) => match self {
443+
MapSerializer::Known(ser) => ser,
444+
MapSerializer::Unknown { ser, len, .. } => {
445+
let rhs = map_size as isize;
446+
let (res, overflowed) = len.overflowing_sub(rhs);
447+
let overflowed = overflowed ^ (rhs < 0);
448+
let res = if overflowed { isize::MIN } else { res };
449+
*len = res;
450+
ser
451+
}
452+
}
453+
.map_header(map_size),
454+
Err(_) => Err(Error::LengthOverflow),
455+
}
456+
} else {
457+
self.serialize_key(key)?;
458+
self.serialize_value(value)
459+
}
460+
}
461+
462462
fn end(self) -> Result<Self::Ok, Self::Error> {
463463
if let MapSerializer::Unknown { ser, begin, len } = self {
464464
let len = len.max(0) as usize;
@@ -495,7 +495,7 @@ impl<'a> ser::SerializeMap for MapSerializer<'a> {
495495
}
496496
}
497497

498-
impl<'a> ser::SerializeStruct for &'a mut Serializer {
498+
impl ser::SerializeStruct for &mut Serializer {
499499
type Ok = ();
500500
type Error = Error;
501501

@@ -512,7 +512,7 @@ impl<'a> ser::SerializeStruct for &'a mut Serializer {
512512
}
513513
}
514514

515-
impl<'a> ser::SerializeTupleVariant for &'a mut Serializer {
515+
impl ser::SerializeTupleVariant for &mut Serializer {
516516
type Ok = ();
517517
type Error = Error;
518518

@@ -528,7 +528,7 @@ impl<'a> ser::SerializeTupleVariant for &'a mut Serializer {
528528
}
529529
}
530530

531-
impl<'a> ser::SerializeStructVariant for &'a mut Serializer {
531+
impl ser::SerializeStructVariant for &mut Serializer {
532532
type Ok = ();
533533
type Error = Error;
534534

‎lib/tests/container.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ impl Neo4jContainer {
184184
.and_then(|o| std::fs::File::open(o).ok())
185185
.into_iter()
186186
.flat_map(|o| std::io::BufReader::new(o).lines())
187-
.any(|o| o.map_or(false, |line| line.trim() == image_name));
187+
.any(|o| o.is_ok_and(|line| line.trim() == image_name));
188188

189189
if !has_license_acceptance {
190190
return Err(format!(

‎lib/tests/use_default_db.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use futures::TryStreamExt;
2-
use neo4rs::{query, Operation};
2+
use neo4rs::query;
3+
#[cfg(feature = "unstable-bolt-protocol-impl-v2")]
4+
use neo4rs::Operation;
35

46
mod container;
57

0 commit comments

Comments
 (0)