Fix CI (#136)

* Fix lints

* Fix lint

* Correct MSRV in README to match value in changelog, CI and Cargo.toml

* Update dependencies

* Fix build in 1.83.0

Workaround for rust-lang/rust#133824

README.md

@@ -102,7 +102,7 @@ prost_reflect_build::Builder::new()
 
 ## Minimum Supported Rust Version
 
-Rust **1.64** or higher.
+Rust **1.70** or higher.
 
 The minimum supported Rust version may be changed in the future, but it will be
 done with a minor version bump.

README.tpl

@@ -28,7 +28,7 @@ A protobuf library extending [`prost`](https://crates.io/crates/prost) with refl
 
 ## Minimum Supported Rust Version
 
-Rust **1.64** or higher.
+Rust **1.70** or higher.
 
 The minimum supported Rust version may be changed in the future, but it will be
 done with a minor version bump.

prost-reflect/src/descriptor/api.rs

@@ -338,13 +338,13 @@ impl DescriptorPool {
             files: &'a [FileDescriptorInner],
         }
 
-        impl<'a> fmt::Debug for FileDescriptorSet<'a> {
+        impl fmt::Debug for FileDescriptorSet<'_> {
             fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
                 f.debug_struct("FileDescriptorSet").finish_non_exhaustive()
             }
         }
 
-        impl<'a> Message for FileDescriptorSet<'a> {
+        impl Message for FileDescriptorSet<'_> {
             fn encode_raw(&self, buf: &mut impl BufMut)
             where
                 Self: Sized,

prost-reflect/src/descriptor/build/names.rs

@@ -47,7 +47,7 @@ struct NameVisitor<'a> {
     errors: Vec<DescriptorErrorKind>,
 }
 
-impl<'a> Visitor for NameVisitor<'a> {
+impl Visitor for NameVisitor<'_> {
     fn visit_file(&mut self, path: &[i32], index: FileIndex, file: &FileDescriptorProto) {
         debug_assert_eq!(to_index(self.pool.files.len()), index);
 
@@ -326,7 +326,7 @@ impl<'a> Visitor for NameVisitor<'a> {
     }
 }
 
-impl<'a> NameVisitor<'a> {
+impl NameVisitor<'_> {
     fn add_name(
         &mut self,
         file: FileIndex,

prost-reflect/src/descriptor/build/options.rs

@@ -74,7 +74,7 @@ struct OptionsVisitor<'a> {
     locations: Vec<(FileIndex, Box<[i32]>, Box<[i32]>)>,
 }
 
-impl<'a> Visitor for OptionsVisitor<'a> {
+impl Visitor for OptionsVisitor<'_> {
     fn visit_file(&mut self, path: &[i32], index: FileIndex, file: &FileDescriptorProto) {
         if let Some(options) = &file.options {
             let path = join_path(path, &[tag::file::OPTIONS]);
@@ -296,7 +296,7 @@ impl<'a> Visitor for OptionsVisitor<'a> {
     }
 }
 
-impl<'a> OptionsVisitor<'a> {
+impl OptionsVisitor<'_> {
     fn resolve_options<T>(
         &mut self,
         desc_name: &str,

prost-reflect/src/descriptor/build/resolve.rs

@@ -49,7 +49,7 @@ struct ResolveVisitor<'a> {
     errors: Vec<DescriptorErrorKind>,
 }
 
-impl<'a> Visitor for ResolveVisitor<'a> {
+impl Visitor for ResolveVisitor<'_> {
     fn visit_file(&mut self, path: &[i32], index: FileIndex, file: &FileDescriptorProto) {
         let mut transitive_dependencies = HashSet::with_capacity(file.dependency.len() + 1);
         transitive_dependencies.insert(index);
@@ -414,7 +414,7 @@ impl<'a> Visitor for ResolveVisitor<'a> {
     }
 }
 
-impl<'a> ResolveVisitor<'a> {
+impl ResolveVisitor<'_> {
     fn resolve_public_dependencies(&self, dependencies: &mut HashSet<FileIndex>, index: FileIndex) {
         let file = &self.pool.files[index as usize];
 

prost-reflect/src/descriptor/types.rs

@@ -545,7 +545,7 @@ where
             src: &'a mut B,
         }
 
-        impl<'a, B> Buf for CopyBufAdapter<'a, B>
+        impl<B> Buf for CopyBufAdapter<'_, B>
         where
             B: Buf,
         {

prost-reflect/src/dynamic/fields.rs

@@ -146,7 +146,7 @@ impl DynamicMessageFieldSet {
     pub(crate) fn iter<'a>(
         &'a self,
         message: &'a MessageDescriptor,
-    ) -> impl Iterator<Item = ValueAndDescriptor> + 'a {
+    ) -> impl Iterator<Item = ValueAndDescriptor<'a>> + 'a {
         self.fields
             .iter()
             .filter_map(move |(&number, value)| match value {
@@ -179,7 +179,7 @@ impl DynamicMessageFieldSet {
     pub(crate) fn iter_include_default<'a>(
         &'a self,
         message: &'a MessageDescriptor,
-    ) -> impl Iterator<Item = ValueAndDescriptor> + 'a {
+    ) -> impl Iterator<Item = ValueAndDescriptor<'a>> + 'a {
         let fields = message
             .fields()
             .filter(move |f| !f.supports_presence() || self.has(f))

prost-reflect/src/dynamic/serde/de/kind.rs

@@ -14,7 +14,7 @@ use super::{
 
 pub struct KindSeed<'a>(pub &'a Kind, pub &'a DeserializeOptions);
 
-impl<'a, 'de> DeserializeSeed<'de> for KindSeed<'a> {
+impl<'de> DeserializeSeed<'de> for KindSeed<'_> {
     type Value = Value;
 
     fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
@@ -64,7 +64,7 @@ pub struct MessageVisitor<'a>(pub &'a MessageDescriptor, pub &'a DeserializeOpti
 pub struct MessageVisitorInner<'a>(pub &'a mut DynamicMessage, pub &'a DeserializeOptions);
 pub struct EnumVisitor<'a>(pub &'a EnumDescriptor);
 
-impl<'a, 'de> Visitor<'de> for ListVisitor<'a> {
+impl<'de> Visitor<'de> for ListVisitor<'_> {
     type Value = Vec<Value>;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -86,7 +86,7 @@ impl<'a, 'de> Visitor<'de> for ListVisitor<'a> {
     }
 }
 
-impl<'a, 'de> Visitor<'de> for MapVisitor<'a> {
+impl<'de> Visitor<'de> for MapVisitor<'_> {
     type Value = HashMap<MapKey, Value>;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -133,7 +133,7 @@ impl<'a, 'de> Visitor<'de> for MapVisitor<'a> {
     }
 }
 
-impl<'de> Visitor<'de> for DoubleVisitor {
+impl Visitor<'_> for DoubleVisitor {
     type Value = f64;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -178,7 +178,7 @@ impl<'de> Visitor<'de> for DoubleVisitor {
     }
 }
 
-impl<'de> Visitor<'de> for FloatVisitor {
+impl Visitor<'_> for FloatVisitor {
     type Value = f32;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -235,7 +235,7 @@ impl<'de> Visitor<'de> for FloatVisitor {
     }
 }
 
-impl<'de> Visitor<'de> for Int32Visitor {
+impl Visitor<'_> for Int32Visitor {
     type Value = i32;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -290,7 +290,7 @@ impl<'de> Visitor<'de> for Int32Visitor {
     }
 }
 
-impl<'de> Visitor<'de> for Uint32Visitor {
+impl Visitor<'_> for Uint32Visitor {
     type Value = u32;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -345,7 +345,7 @@ impl<'de> Visitor<'de> for Uint32Visitor {
     }
 }
 
-impl<'de> Visitor<'de> for Int64Visitor {
+impl Visitor<'_> for Int64Visitor {
     type Value = i64;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -392,7 +392,7 @@ impl<'de> Visitor<'de> for Int64Visitor {
     }
 }
 
-impl<'de> Visitor<'de> for Uint64Visitor {
+impl Visitor<'_> for Uint64Visitor {
     type Value = u64;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -439,7 +439,7 @@ impl<'de> Visitor<'de> for Uint64Visitor {
     }
 }
 
-impl<'de> Visitor<'de> for StringVisitor {
+impl Visitor<'_> for StringVisitor {
     type Value = String;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -463,7 +463,7 @@ impl<'de> Visitor<'de> for StringVisitor {
     }
 }
 
-impl<'de> Visitor<'de> for BoolVisitor {
+impl Visitor<'_> for BoolVisitor {
     type Value = bool;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -479,7 +479,7 @@ impl<'de> Visitor<'de> for BoolVisitor {
     }
 }
 
-impl<'de> Visitor<'de> for BytesVisitor {
+impl Visitor<'_> for BytesVisitor {
     type Value = Bytes;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -519,7 +519,7 @@ impl<'de> Visitor<'de> for BytesVisitor {
     }
 }
 
-impl<'a, 'de> Visitor<'de> for MessageVisitor<'a> {
+impl<'de> Visitor<'de> for MessageVisitor<'_> {
     type Value = DynamicMessage;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -538,7 +538,7 @@ impl<'a, 'de> Visitor<'de> for MessageVisitor<'a> {
     }
 }
 
-impl<'a, 'de> Visitor<'de> for MessageVisitorInner<'a> {
+impl<'de> Visitor<'de> for MessageVisitorInner<'_> {
     type Value = ();
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -588,7 +588,7 @@ impl<'a, 'de> Visitor<'de> for MessageVisitorInner<'a> {
     }
 }
 
-impl<'a, 'de> Visitor<'de> for EnumVisitor<'a> {
+impl Visitor<'_> for EnumVisitor<'_> {
     type Value = i32;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {

prost-reflect/src/dynamic/serde/de/mod.rs

@@ -87,7 +87,7 @@ where
 
 struct MessageSeed<'a>(&'a MessageDescriptor, &'a DeserializeOptions);
 
-impl<'a, 'de> DeserializeSeed<'de> for MessageSeed<'a> {
+impl<'de> DeserializeSeed<'de> for MessageSeed<'_> {
     type Value = DynamicMessage;
 
     fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
@@ -100,7 +100,7 @@ impl<'a, 'de> DeserializeSeed<'de> for MessageSeed<'a> {
 
 struct FieldDescriptorSeed<'a, T>(&'a T, &'a DeserializeOptions);
 
-impl<'a, 'de, T> DeserializeSeed<'de> for FieldDescriptorSeed<'a, T>
+impl<'de, T> DeserializeSeed<'de> for FieldDescriptorSeed<'_, T>
 where
     T: FieldDescriptorLike,
 {
@@ -126,7 +126,7 @@ where
 
 struct OptionalFieldDescriptorSeed<'a, T>(&'a T, &'a DeserializeOptions);
 
-impl<'a, 'de, T> DeserializeSeed<'de> for OptionalFieldDescriptorSeed<'a, T>
+impl<'de, T> DeserializeSeed<'de> for OptionalFieldDescriptorSeed<'_, T>
 where
     T: FieldDescriptorLike,
 {
@@ -140,7 +140,7 @@ where
     }
 }
 
-impl<'a, 'de, T> Visitor<'de> for OptionalFieldDescriptorSeed<'a, T>
+impl<'de, T> Visitor<'de> for OptionalFieldDescriptorSeed<'_, T>
 where
     T: FieldDescriptorLike,
 {

prost-reflect/src/dynamic/serde/de/wkt.rs

@@ -34,7 +34,7 @@ pub struct GoogleProtobufStructVisitor;
 pub struct GoogleProtobufValueVisitor;
 pub struct GoogleProtobufEmptyVisitor;
 
-impl<'a, 'de> Visitor<'de> for GoogleProtobufAnyVisitor<'a> {
+impl<'de> Visitor<'de> for GoogleProtobufAnyVisitor<'_> {
     type Value = prost_types::Any;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -131,7 +131,7 @@ impl<'a, 'de> Visitor<'de> for GoogleProtobufAnyVisitor<'a> {
     }
 }
 
-impl<'de> Visitor<'de> for GoogleProtobufNullVisitor {
+impl Visitor<'_> for GoogleProtobufNullVisitor {
     type Value = i32;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -158,7 +158,7 @@ impl<'de> Visitor<'de> for GoogleProtobufNullVisitor {
     }
 }
 
-impl<'de> Visitor<'de> for GoogleProtobufTimestampVisitor {
+impl Visitor<'_> for GoogleProtobufTimestampVisitor {
     type Value = prost_types::Timestamp;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -179,7 +179,7 @@ impl<'de> Visitor<'de> for GoogleProtobufTimestampVisitor {
     }
 }
 
-impl<'de> Visitor<'de> for GoogleProtobufDurationVisitor {
+impl Visitor<'_> for GoogleProtobufDurationVisitor {
     type Value = prost_types::Duration;
 
     fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -198,7 +198,7 @@ impl<'de> Visitor<'de> for GoogleProtobufDurationVisitor {
     }
 }
 
-impl<'de> Visitor<'de> for GoogleProtobufFieldMaskVisitor {
+impl Visitor<'_> for GoogleProtobufFieldMaskVisitor {
     type Value = prost_types::FieldMask;
 
     fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>

prost-reflect/src/dynamic/serde/ser/mod.rs

@@ -30,7 +30,7 @@ where
     .serialize(serializer)
 }
 
-impl<'a> Serialize for SerializeWrapper<'a, DynamicMessage> {
+impl Serialize for SerializeWrapper<'_, DynamicMessage> {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,
@@ -237,7 +237,7 @@ impl<'a> Serialize for SerializeWrapper<'a, ValueAndKind<'a>> {
     }
 }
 
-impl<'a> Serialize for SerializeWrapper<'a, MapKey> {
+impl Serialize for SerializeWrapper<'_, MapKey> {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,

prost-reflect/src/dynamic/serde/ser/wkt.rs

@@ -330,7 +330,7 @@ where
     serialize_list_inner(&raw, serializer, options)
 }
 
-impl<'a> Serialize for SerializeWrapper<'a, prost_types::Value> {
+impl Serialize for SerializeWrapper<'_, prost_types::Value> {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,

prost-reflect/src/dynamic/text_format/parse/lex.rs

@@ -62,7 +62,7 @@ pub(crate) struct TokenExtras {
     pub error: Option<ParseErrorKind>,
 }
 
-impl<'a> fmt::Display for Token<'a> {
+impl fmt::Display for Token<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Token::Ident(value) => write!(f, "{}", value),