Skip to content

Commit cab2da6

Browse files
tobiemhtobiemh
committed
Fix clippy warnings
1 parent 9a03630 commit cab2da6

File tree

3 files changed

+70
-77
lines changed

3 files changed

+70
-77
lines changed

‎src/decode.rs

+53-59
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use std::fmt;
66
use std::io::{self, BufRead};
77
use std::marker::PhantomData;
88
use std::str;
9-
use std::{i16, i32, i64, i8};
109
use thiserror::Error;
1110

1211
use self::read::{ReadReader, ReadReference, Reference, SliceReader};
@@ -109,7 +108,7 @@ impl<'de, R: ReadReference<'de>> Deserializer<R> {
109108
}
110109
}
111110

112-
impl<'de, 'a, R> serde::de::Deserializer<'de> for &'a mut Deserializer<R>
111+
impl<'de, R> serde::de::Deserializer<'de> for &mut Deserializer<R>
113112
where
114113
R: ReadReference<'de>,
115114
{
@@ -232,7 +231,7 @@ where
232231
let c = string.chars().next().ok_or(Error::InvalidUtf8)?;
233232
visitor.visit_char(c)
234233
}
235-
Err(_) => return Err(Error::UnexpectedEof),
234+
Err(_) => Err(Error::UnexpectedEof),
236235
}
237236
}
238237

@@ -251,7 +250,7 @@ where
251250
visitor.visit_str(string)
252251
}
253252
},
254-
Err(_) => return Err(Error::UnexpectedEof),
253+
Err(_) => Err(Error::UnexpectedEof),
255254
}
256255
}
257256

@@ -332,7 +331,7 @@ where
332331
_spooky: PhantomData<&'de ()>,
333332
}
334333

335-
impl<'de, 'a, R> serde::de::SeqAccess<'de> for Access<'de, 'a, R>
334+
impl<'de, R> serde::de::SeqAccess<'de> for Access<'de, '_, R>
336335
where
337336
R: ReadReference<'de>,
338337
{
@@ -374,7 +373,7 @@ where
374373
_spooky: PhantomData<&'de ()>,
375374
}
376375

377-
impl<'de, 'a, R> serde::de::SeqAccess<'de> for Access<'de, 'a, R>
376+
impl<'de, R> serde::de::SeqAccess<'de> for Access<'de, '_, R>
378377
where
379378
R: ReadReference<'de>,
380379
{
@@ -428,7 +427,7 @@ where
428427
_spooky: PhantomData<&'de ()>,
429428
}
430429

431-
impl<'de, 'a, R> serde::de::MapAccess<'de> for Access<'de, 'a, R>
430+
impl<'de, R> serde::de::MapAccess<'de> for Access<'de, '_, R>
432431
where
433432
R: ReadReference<'de>,
434433
{
@@ -485,74 +484,69 @@ where
485484
where
486485
V: Visitor<'de>,
487486
{
488-
impl<'de, 'a, R> serde::de::EnumAccess<'de> for &'a mut Deserializer<R>
489-
where
490-
R: ReadReference<'de>,
491-
{
492-
type Error = Error;
493-
type Variant = Self;
487+
visitor.visit_enum(self)
488+
}
494489

495-
fn variant_seed<V>(self, seed: V) -> Result<(V::Value, Self::Variant)>
496-
where
497-
V: serde::de::DeserializeSeed<'de>,
498-
{
499-
let idx: u32 = serde::de::Deserialize::deserialize(&mut *self)?;
500-
let val: Result<_> =
501-
seed.deserialize(serde::de::IntoDeserializer::into_deserializer(idx));
502-
Ok((val?, self))
503-
}
504-
}
490+
fn deserialize_ignored_any<V>(self, _visitor: V) -> Result<V::Value>
491+
where
492+
V: serde::de::Visitor<'de>,
493+
{
494+
Err(Error::DeserializeAnyUnsupported)
495+
}
505496

506-
impl<'de, 'a, R> serde::de::VariantAccess<'de> for &'a mut Deserializer<R>
507-
where
508-
R: ReadReference<'de>,
509-
{
510-
type Error = Error;
497+
fn deserialize_identifier<V>(self, _visitor: V) -> Result<V::Value>
498+
where
499+
V: serde::de::Visitor<'de>,
500+
{
501+
Err(Error::DeserializeAnyUnsupported)
502+
}
503+
}
511504

512-
fn unit_variant(self) -> Result<()> {
513-
Ok(())
514-
}
505+
impl<'de, R> serde::de::EnumAccess<'de> for &mut Deserializer<R>
506+
where
507+
R: ReadReference<'de>,
508+
{
509+
type Error = Error;
510+
type Variant = Self;
515511

516-
fn newtype_variant_seed<T>(self, seed: T) -> Result<T::Value>
517-
where
518-
T: serde::de::DeserializeSeed<'de>,
519-
{
520-
serde::de::DeserializeSeed::deserialize(seed, self)
521-
}
512+
fn variant_seed<V>(self, seed: V) -> Result<(V::Value, Self::Variant)>
513+
where
514+
V: serde::de::DeserializeSeed<'de>,
515+
{
516+
let idx: u32 = serde::de::Deserialize::deserialize(&mut *self)?;
517+
let val: Result<_> = seed.deserialize(serde::de::IntoDeserializer::into_deserializer(idx));
518+
Ok((val?, self))
519+
}
520+
}
522521

523-
fn tuple_variant<V>(self, len: usize, visitor: V) -> Result<V::Value>
524-
where
525-
V: serde::de::Visitor<'de>,
526-
{
527-
serde::de::Deserializer::deserialize_tuple(self, len, visitor)
528-
}
522+
impl<'de, R> serde::de::VariantAccess<'de> for &mut Deserializer<R>
523+
where
524+
R: ReadReference<'de>,
525+
{
526+
type Error = Error;
529527

530-
fn struct_variant<V>(
531-
self,
532-
fields: &'static [&'static str],
533-
visitor: V,
534-
) -> Result<V::Value>
535-
where
536-
V: serde::de::Visitor<'de>,
537-
{
538-
serde::de::Deserializer::deserialize_tuple(self, fields.len(), visitor)
539-
}
540-
}
528+
fn unit_variant(self) -> Result<()> {
529+
Ok(())
530+
}
541531

542-
visitor.visit_enum(self)
532+
fn newtype_variant_seed<T>(self, seed: T) -> Result<T::Value>
533+
where
534+
T: serde::de::DeserializeSeed<'de>,
535+
{
536+
serde::de::DeserializeSeed::deserialize(seed, self)
543537
}
544538

545-
fn deserialize_ignored_any<V>(self, _visitor: V) -> Result<V::Value>
539+
fn tuple_variant<V>(self, len: usize, visitor: V) -> Result<V::Value>
546540
where
547541
V: serde::de::Visitor<'de>,
548542
{
549-
Err(Error::DeserializeAnyUnsupported)
543+
serde::de::Deserializer::deserialize_tuple(self, len, visitor)
550544
}
551545

552-
fn deserialize_identifier<V>(self, _visitor: V) -> Result<V::Value>
546+
fn struct_variant<V>(self, fields: &'static [&'static str], visitor: V) -> Result<V::Value>
553547
where
554548
V: serde::de::Visitor<'de>,
555549
{
556-
Err(Error::DeserializeAnyUnsupported)
550+
serde::de::Deserializer::deserialize_tuple(self, fields.len(), visitor)
557551
}
558552
}

‎src/decode/read.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl<'a> SliceReader<'a> {
9999
}
100100
}
101101

102-
impl<'a> Read for SliceReader<'a> {
102+
impl Read for SliceReader<'_> {
103103
#[inline]
104104
fn read(&mut self, buf: &mut [u8]) -> Result<usize, io::Error> {
105105
self.inner.read(buf)
@@ -111,7 +111,7 @@ impl<'a> Read for SliceReader<'a> {
111111
}
112112
}
113113

114-
impl<'a> BufRead for SliceReader<'a> {
114+
impl BufRead for SliceReader<'_> {
115115
fn fill_buf(&mut self) -> io::Result<&[u8]> {
116116
self.inner.fill_buf()
117117
}

‎src/encode.rs

+15-16
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use byteorder::{WriteBytesExt, BE};
22
use serde::{self, Serialize};
33
use std::fmt;
44
use std::io::{self, Write};
5-
use std::{self, i16, i32, i64, i8};
65
use thiserror::Error;
76

87
/// A serializer for a byte format that preserves lexicographic sort order.
@@ -193,24 +192,24 @@ where
193192
if val < 1 << 4 {
194193
self.writer.write_u8(val as u8)
195194
} else if val < 1 << 12 {
196-
self.writer.write_u16::<BE>((val as u16) | 1 << 12)
195+
self.writer.write_u16::<BE>((val as u16) | (1 << 12))
197196
} else if val < 1 << 20 {
198-
self.writer.write_u8(((val >> 16) as u8) | 2 << 4)?;
197+
self.writer.write_u8(((val >> 16) as u8) | (2 << 4))?;
199198
self.writer.write_u16::<BE>(val as u16)
200199
} else if val < 1 << 28 {
201-
self.writer.write_u32::<BE>((val as u32) | 3 << 28)
200+
self.writer.write_u32::<BE>((val as u32) | (3 << 28))
202201
} else if val < 1 << 36 {
203-
self.writer.write_u8(((val >> 32) as u8) | 4 << 4)?;
202+
self.writer.write_u8(((val >> 32) as u8) | (4 << 4))?;
204203
self.writer.write_u32::<BE>(val as u32)
205204
} else if val < 1 << 44 {
206-
self.writer.write_u16::<BE>(((val >> 32) as u16) | 5 << 12)?;
205+
self.writer.write_u16::<BE>(((val >> 32) as u16) | (5 << 12))?;
207206
self.writer.write_u32::<BE>(val as u32)
208207
} else if val < 1 << 52 {
209-
self.writer.write_u8(((val >> 48) as u8) | 6 << 4)?;
208+
self.writer.write_u8(((val >> 48) as u8) | (6 << 4))?;
210209
self.writer.write_u16::<BE>((val >> 32) as u16)?;
211210
self.writer.write_u32::<BE>(val as u32)
212211
} else if val < 1 << 60 {
213-
self.writer.write_u64::<BE>(val | 7 << 60)
212+
self.writer.write_u64::<BE>(val | (7 << 60))
214213
} else {
215214
self.writer.write_u8(8 << 4)?;
216215
self.writer.write_u64::<BE>(val)
@@ -327,7 +326,7 @@ where
327326
}
328327
}
329328

330-
impl<'a, W> serde::Serializer for &'a mut Serializer<W>
329+
impl<W> serde::Serializer for &mut Serializer<W>
331330
where
332331
W: Write,
333332
{
@@ -524,7 +523,7 @@ where
524523

525524
// Compound Implementations.
526525

527-
impl<'a, W> serde::ser::SerializeSeq for &'a mut Serializer<W>
526+
impl<W> serde::ser::SerializeSeq for &mut Serializer<W>
528527
where
529528
W: Write,
530529
{
@@ -544,7 +543,7 @@ where
544543
}
545544
}
546545

547-
impl<'a, W> serde::ser::SerializeTuple for &'a mut Serializer<W>
546+
impl<W> serde::ser::SerializeTuple for &mut Serializer<W>
548547
where
549548
W: Write,
550549
{
@@ -563,7 +562,7 @@ where
563562
}
564563
}
565564

566-
impl<'a, W> serde::ser::SerializeTupleStruct for &'a mut Serializer<W>
565+
impl<W> serde::ser::SerializeTupleStruct for &mut Serializer<W>
567566
where
568567
W: Write,
569568
{
@@ -582,7 +581,7 @@ where
582581
}
583582
}
584583

585-
impl<'a, W> serde::ser::SerializeTupleVariant for &'a mut Serializer<W>
584+
impl<W> serde::ser::SerializeTupleVariant for &mut Serializer<W>
586585
where
587586
W: Write,
588587
{
@@ -601,7 +600,7 @@ where
601600
}
602601
}
603602

604-
impl<'a, W> serde::ser::SerializeMap for &'a mut Serializer<W>
603+
impl<W> serde::ser::SerializeMap for &mut Serializer<W>
605604
where
606605
W: Write,
607606
{
@@ -628,7 +627,7 @@ where
628627
}
629628
}
630629

631-
impl<'a, W> serde::ser::SerializeStruct for &'a mut Serializer<W>
630+
impl<W> serde::ser::SerializeStruct for &mut Serializer<W>
632631
where
633632
W: Write,
634633
{
@@ -647,7 +646,7 @@ where
647646
}
648647
}
649648

650-
impl<'a, W> serde::ser::SerializeStructVariant for &'a mut Serializer<W>
649+
impl<W> serde::ser::SerializeStructVariant for &mut Serializer<W>
651650
where
652651
W: Write,
653652
{

0 commit comments

Comments
 (0)