diff --git a/protobuf/src/reflect/dynamic/map.rs b/protobuf/src/reflect/dynamic/map.rs index 902f9bfa0..c57b55ce2 100644 --- a/protobuf/src/reflect/dynamic/map.rs +++ b/protobuf/src/reflect/dynamic/map.rs @@ -115,7 +115,7 @@ impl DynamicMap { struct DynamicMapIterImpl<'a, K: ProtobufValue + Eq + Hash + 'static> { iter: hash_map::Iter<'a, K, ReflectValueBox>, - value: &'a RuntimeType, + _value_type: &'a RuntimeType, } impl<'a, K: ProtobufValue + Eq + Hash + 'static> ReflectMapIterTrait<'a> @@ -131,8 +131,8 @@ impl<'a, K: ProtobufValue + Eq + Hash + 'static> ReflectMapIterTrait<'a> K::RuntimeType::runtime_type_box() } - fn value_type(&self) -> RuntimeType { - self.value.clone() + fn _value_type(&self) -> RuntimeType { + self._value_type.clone() } } @@ -141,27 +141,27 @@ impl ReflectMap for DynamicMap { match &self.maps { Maps::U32(m) => ReflectMapIter::new(DynamicMapIterImpl { iter: m.iter(), - value: &self.value, + _value_type: &self.value, }), Maps::I32(m) => ReflectMapIter::new(DynamicMapIterImpl { iter: m.iter(), - value: &self.value, + _value_type: &self.value, }), Maps::U64(m) => ReflectMapIter::new(DynamicMapIterImpl { iter: m.iter(), - value: &self.value, + _value_type: &self.value, }), Maps::I64(m) => ReflectMapIter::new(DynamicMapIterImpl { iter: m.iter(), - value: &self.value, + _value_type: &self.value, }), Maps::Bool(m) => ReflectMapIter::new(DynamicMapIterImpl { iter: m.iter(), - value: &self.value, + _value_type: &self.value, }), Maps::String(m) => ReflectMapIter::new(DynamicMapIterImpl { iter: m.iter(), - value: &self.value, + _value_type: &self.value, }), } } diff --git a/protobuf/src/reflect/map/empty.rs b/protobuf/src/reflect/map/empty.rs index 5ac908de3..f8be6a3d4 100644 --- a/protobuf/src/reflect/map/empty.rs +++ b/protobuf/src/reflect/map/empty.rs @@ -67,7 +67,7 @@ impl<'a> ReflectMapIterTrait<'a> for DynamicEmptyMapIter { self.key_type.clone() } - fn value_type(&self) -> RuntimeType { + fn _value_type(&self) -> RuntimeType { self.value_type.clone() } } diff --git a/protobuf/src/reflect/map/generated.rs b/protobuf/src/reflect/map/generated.rs index d1f01047e..3fc8b402b 100644 --- a/protobuf/src/reflect/map/generated.rs +++ b/protobuf/src/reflect/map/generated.rs @@ -118,7 +118,7 @@ impl<'a, K: ProtobufValue, V: ProtobufValue, I: Iterator> K::RuntimeType::runtime_type_box() } - fn value_type(&self) -> RuntimeType { + fn _value_type(&self) -> RuntimeType { V::RuntimeType::runtime_type_box() } } diff --git a/protobuf/src/reflect/map/mod.rs b/protobuf/src/reflect/map/mod.rs index c927473fa..806176892 100644 --- a/protobuf/src/reflect/map/mod.rs +++ b/protobuf/src/reflect/map/mod.rs @@ -34,7 +34,7 @@ pub(crate) trait ReflectMap: Debug + Send + Sync + 'static { pub(crate) trait ReflectMapIterTrait<'a> { fn next(&mut self) -> Option<(ReflectValueRef<'a>, ReflectValueRef<'a>)>; fn key_type(&self) -> RuntimeType; - fn value_type(&self) -> RuntimeType; + fn _value_type(&self) -> RuntimeType; } pub struct ReflectMapIter<'a> { @@ -252,7 +252,7 @@ impl<'a> ReflectMapRefIter<'a> { } fn _value_type(&self) -> RuntimeType { - self.iter.imp.value_type() + self.iter.imp._value_type() } }