Made clippy happy, again

zesterer · Oct 18, 2024 · c9a2b3c · c9a2b3c
1 parent 716bec8
commit c9a2b3c
Show file tree

Hide file tree

Showing 13 changed files with 130 additions and 89 deletions.
diff --git a/benches/cbor.rs b/benches/cbor.rs
@@ -299,7 +299,7 @@ mod nom {
         Ok((i, CborZero::Tag(tag, Box::new(value))))
     }
 
-    fn float_simple<'a>(i: &'a [u8]) -> IResult<&[u8], CborZero<'a>> {
+    fn float_simple(i: &[u8]) -> IResult<&[u8], CborZero<'_>> {
         bits(preceded(
             tag(7, 3usize),
             alt((
@@ -311,13 +311,13 @@ mod nom {
                 // preceded(tag(25, 5usize), map(be_f16, |v| CborZero::HalfFloat(v))),
                 preceded(
                     tag(26, 5usize),
-                    map(bytes(be_f32::<_, nom::error::Error<&'a [u8]>>), |v| {
+                    map(bytes(be_f32::<_, nom::error::Error<&[u8]>>), |v| {
                         CborZero::SingleFloat(v)
                     }),
                 ),
                 preceded(
                     tag(27, 5usize),
-                    map(bytes(be_f64::<_, nom::error::Error<&'a [u8]>>), |v| {
+                    map(bytes(be_f64::<_, nom::error::Error<&[u8]>>), |v| {
                         CborZero::DoubleFloat(v)
                     }),
                 ),

diff --git a/benches/json.rs b/benches/json.rs
@@ -296,7 +296,7 @@ mod nom {
         )(i)
     }
 
-    fn array<'a, E: ParseError<&'a [u8]>>(i: &'a [u8]) -> IResult<&'a [u8], Vec<JsonZero>, E> {
+    fn array<'a, E: ParseError<&'a [u8]>>(i: &'a [u8]) -> IResult<&'a [u8], Vec<JsonZero<'a>>, E> {
         preceded(
             char('['),
             cut(terminated(
@@ -308,7 +308,7 @@ mod nom {
 
     fn member<'a, E: ParseError<&'a [u8]>>(
         i: &'a [u8],
-    ) -> IResult<&'a [u8], (&'a [u8], JsonZero), E> {
+    ) -> IResult<&'a [u8], (&'a [u8], JsonZero<'a>), E> {
         separated_pair(
             preceded(space, string),
             cut(preceded(space, char(':'))),
@@ -318,7 +318,7 @@ mod nom {
 
     fn object<'a, E: ParseError<&'a [u8]>>(
         i: &'a [u8],
-    ) -> IResult<&'a [u8], Vec<(&'a [u8], JsonZero)>, E> {
+    ) -> IResult<&'a [u8], Vec<(&'a [u8], JsonZero<'a>)>, E> {
         preceded(
             char('{'),
             cut(terminated(
@@ -328,7 +328,7 @@ mod nom {
         )(i)
     }
 
-    fn value<'a, E: ParseError<&'a [u8]>>(i: &'a [u8]) -> IResult<&'a [u8], JsonZero, E> {
+    fn value<'a, E: ParseError<&'a [u8]>>(i: &'a [u8]) -> IResult<&'a [u8], JsonZero<'a>, E> {
         preceded(
             space,
             alt((
@@ -343,7 +343,7 @@ mod nom {
         )(i)
     }
 
-    fn root<'a, E: ParseError<&'a [u8]>>(i: &'a [u8]) -> IResult<&'a [u8], JsonZero, E> {
+    fn root<'a, E: ParseError<&'a [u8]>>(i: &'a [u8]) -> IResult<&'a [u8], JsonZero<'a>, E> {
         terminated(value, space)(i)
     }
 

diff --git a/examples/logos.rs b/examples/logos.rs
@@ -35,7 +35,7 @@ enum Token<'a> {
     Whitespace,
 }
 
-impl<'a> fmt::Display for Token<'a> {
+impl fmt::Display for Token<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Self::Float(s) => write!(f, "{}", s),

diff --git a/examples/nano_rust.rs b/examples/nano_rust.rs
@@ -25,7 +25,7 @@ enum Token<'src> {
     Else,
 }
 
-impl<'src> fmt::Display for Token<'src> {
+impl fmt::Display for Token<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Token::Null => write!(f, "null"),
@@ -110,7 +110,7 @@ enum Value<'src> {
     Func(&'src str),
 }
 
-impl<'src> Value<'src> {
+impl Value<'_> {
     fn num(self, span: Span) -> Result<f64, Error> {
         if let Value::Num(x) = self {
             Ok(x)
@@ -123,7 +123,7 @@ impl<'src> Value<'src> {
     }
 }
 
-impl<'src> std::fmt::Display for Value<'src> {
+impl std::fmt::Display for Value<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
             Self::Null => write!(f, "null"),

diff --git a/src/blanket.rs b/src/blanket.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-impl<'a, 'b, T, I, O, E> ParserSealed<'a, I, O, E> for &'b T
+impl<'a, T, I, O, E> ParserSealed<'a, I, O, E> for &T
 where
     T: ?Sized + Parser<'a, I, O, E>,
     I: Input<'a>,
@@ -16,7 +16,7 @@ where
     go_extra!(O);
 }
 
-impl<'a, 'b, T, I, O, E> ConfigParserSealed<'a, I, O, E> for &'b T
+impl<'a, T, I, O, E> ConfigParserSealed<'a, I, O, E> for &T
 where
     T: ?Sized + ConfigParser<'a, I, O, E>,
     I: Input<'a>,

diff --git a/src/combinator.rs b/src/combinator.rs
@@ -85,7 +85,8 @@ where
     I: Input<'a>,
     E: ParserExtra<'a, I>,
 {
-    type IterState<M: Mode> = (A::IterState<M>, A::Config)
+    type IterState<M: Mode>
+        = (A::IterState<M>, A::Config)
     where
         I: 'a;
 
@@ -158,7 +159,8 @@ where
     I: Input<'a>,
     E: ParserExtra<'a, I>,
 {
-    type IterState<M: Mode> = (A::IterState<M>, A::Config)
+    type IterState<M: Mode>
+        = (A::IterState<M>, A::Config)
     where
         I: 'a;
 
@@ -304,7 +306,8 @@ where
     A: IterParser<'a, I, OA, E>,
     F: Fn(OA) -> O,
 {
-    type IterState<M: Mode> = A::IterState<M>
+    type IterState<M: Mode>
+        = A::IterState<M>
     where
         I: 'a;
 
@@ -375,7 +378,8 @@ where
     A: IterParser<'a, I, OA, E>,
     F: Fn(OA, &mut MapExtra<'a, '_, I, E>) -> O,
 {
-    type IterState<M: Mode> = A::IterState<M>
+    type IterState<M: Mode>
+        = A::IterState<M>
     where
         I: 'a;
 
@@ -453,7 +457,8 @@ where
     F: Fn<OA, Output = O>,
     OA: Tuple,
 {
-    type IterState<M: Mode> = A::IterState<M>
+    type IterState<M: Mode>
+        = A::IterState<M>
     where
         I: 'a;
 
@@ -1040,7 +1045,8 @@ where
     B: IterParser<'a, I, OB, extra::Full<E::Error, E::State, OA>>,
     OA: 'a,
 {
-    type IterState<M: Mode> = (OA, B::IterState<M>)
+    type IterState<M: Mode>
+        = (OA, B::IterState<M>)
     where
         I: 'a;
 
@@ -1113,7 +1119,8 @@ where
     B: IterParser<'a, I, OB, extra::Full<E::Error, E::State, OA>>,
     OA: 'a,
 {
-    type IterState<M: Mode> = (OA, B::IterState<M>)
+    type IterState<M: Mode>
+        = (OA, B::IterState<M>)
     where
         I: 'a;
 
@@ -1734,7 +1741,8 @@ where
     A: Parser<'a, I, OA, E>,
     B: Parser<'a, I, OB, E>,
 {
-    type IterState<M: Mode> = usize
+    type IterState<M: Mode>
+        = usize
     where
         I: 'a;
 
@@ -1863,7 +1871,8 @@ where
     I: Input<'a>,
     E: ParserExtra<'a, I>,
 {
-    type IterState<M: Mode> = (usize, A::IterState<M>)
+    type IterState<M: Mode>
+        = (usize, A::IterState<M>)
     where
         I: 'a;