Regenerate *.rs files in `src/proto/`

    for new protobuf version 2.17.0

src/proto/fileformat.rs

@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.15.0. Do not edit
+// This file is generated by rust-protobuf 2.17.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -15,17 +15,13 @@
 #![allow(non_snake_case)]
 #![allow(non_upper_case_globals)]
 #![allow(trivial_casts)]
-#![allow(unsafe_code)]
 #![allow(unused_imports)]
 #![allow(unused_results)]
 //! Generated file from `src/proto/fileformat.proto`
 
-use protobuf::Message as Message_imported_for_functions;
-use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
-
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_15_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_17_0;
 
 #[derive(PartialEq,Clone,Default,Debug)]
 pub struct Blob {
@@ -313,7 +309,7 @@ impl ::protobuf::Message for Blob {
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
         self as &mut dyn (::std::any::Any)
     }
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -326,10 +322,8 @@ impl ::protobuf::Message for Blob {
     }
 
     fn default_instance() -> &'static Blob {
-        static mut instance: ::protobuf::lazy::Lazy<Blob> = ::protobuf::lazy::Lazy::INIT;
-        unsafe {
-            instance.get(Blob::new)
-        }
+        static instance: ::protobuf::rt::LazyV2<Blob> = ::protobuf::rt::LazyV2::INIT;
+        instance.get(Blob::new)
     }
 }
 
@@ -550,7 +544,7 @@ impl ::protobuf::Message for BlobHeader {
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
         self as &mut dyn (::std::any::Any)
     }
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -563,10 +557,8 @@ impl ::protobuf::Message for BlobHeader {
     }
 
     fn default_instance() -> &'static BlobHeader {
-        static mut instance: ::protobuf::lazy::Lazy<BlobHeader> = ::protobuf::lazy::Lazy::INIT;
-        unsafe {
-            instance.get(BlobHeader::new)
-        }
+        static instance: ::protobuf::rt::LazyV2<BlobHeader> = ::protobuf::rt::LazyV2::INIT;
+        instance.get(BlobHeader::new)
     }
 }
 

src/proto/osmformat.rs

@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.15.0. Do not edit
+// This file is generated by rust-protobuf 2.17.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -15,24 +15,20 @@
 #![allow(non_snake_case)]
 #![allow(non_upper_case_globals)]
 #![allow(trivial_casts)]
-#![allow(unsafe_code)]
 #![allow(unused_imports)]
 #![allow(unused_results)]
 //! Generated file from `src/proto/osmformat.proto`
 
-use protobuf::Message as Message_imported_for_functions;
-use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
-
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_15_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_17_0;
 
 #[derive(PartialEq,Clone,Default,Debug)]
 pub struct HeaderBlock {
     // message fields
-    bbox: ::protobuf::SingularPtrField<HeaderBBox>,
-    required_features: ::protobuf::RepeatedField<::std::string::String>,
-    optional_features: ::protobuf::RepeatedField<::std::string::String>,
+    pub bbox: ::protobuf::SingularPtrField<HeaderBBox>,
+    pub required_features: ::protobuf::RepeatedField<::std::string::String>,
+    pub optional_features: ::protobuf::RepeatedField<::std::string::String>,
     writingprogram: ::protobuf::SingularField<::std::string::String>,
     source: ::protobuf::SingularField<::std::string::String>,
     osmosis_replication_timestamp: ::std::option::Option<i64>,
@@ -58,7 +54,7 @@ impl HeaderBlock {
 
 
     pub fn get_bbox(&self) -> &HeaderBBox {
-        self.bbox.as_ref().unwrap_or_else(|| HeaderBBox::default_instance())
+        self.bbox.as_ref().unwrap_or_else(|| <HeaderBBox as ::protobuf::Message>::default_instance())
     }
     pub fn clear_bbox(&mut self) {
         self.bbox.clear();
@@ -421,7 +417,7 @@ impl ::protobuf::Message for HeaderBlock {
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
         self as &mut dyn (::std::any::Any)
     }
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -434,10 +430,8 @@ impl ::protobuf::Message for HeaderBlock {
     }
 
     fn default_instance() -> &'static HeaderBlock {
-        static mut instance: ::protobuf::lazy::Lazy<HeaderBlock> = ::protobuf::lazy::Lazy::INIT;
-        unsafe {
-            instance.get(HeaderBlock::new)
-        }
+        static instance: ::protobuf::rt::LazyV2<HeaderBlock> = ::protobuf::rt::LazyV2::INIT;
+        instance.get(HeaderBlock::new)
     }
 }
 
@@ -674,7 +668,7 @@ impl ::protobuf::Message for HeaderBBox {
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
         self as &mut dyn (::std::any::Any)
     }
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -687,10 +681,8 @@ impl ::protobuf::Message for HeaderBBox {
     }
 
     fn default_instance() -> &'static HeaderBBox {
-        static mut instance: ::protobuf::lazy::Lazy<HeaderBBox> = ::protobuf::lazy::Lazy::INIT;
-        unsafe {
-            instance.get(HeaderBBox::new)
-        }
+        static instance: ::protobuf::rt::LazyV2<HeaderBBox> = ::protobuf::rt::LazyV2::INIT;
+        instance.get(HeaderBBox::new)
     }
 }
 
@@ -713,8 +705,8 @@ impl ::protobuf::reflect::ProtobufValue for HeaderBBox {
 #[derive(PartialEq,Clone,Default,Debug)]
 pub struct PrimitiveBlock {
     // message fields
-    stringtable: ::protobuf::SingularPtrField<StringTable>,
-    primitivegroup: ::protobuf::RepeatedField<PrimitiveGroup>,
+    pub stringtable: ::protobuf::SingularPtrField<StringTable>,
+    pub primitivegroup: ::protobuf::RepeatedField<PrimitiveGroup>,
     granularity: ::std::option::Option<i32>,
     lat_offset: ::std::option::Option<i64>,
     lon_offset: ::std::option::Option<i64>,
@@ -739,7 +731,7 @@ impl PrimitiveBlock {
 
 
     pub fn get_stringtable(&self) -> &StringTable {
-        self.stringtable.as_ref().unwrap_or_else(|| StringTable::default_instance())
+        self.stringtable.as_ref().unwrap_or_else(|| <StringTable as ::protobuf::Message>::default_instance())
     }
     pub fn clear_stringtable(&mut self) {
         self.stringtable.clear();
@@ -1008,7 +1000,7 @@ impl ::protobuf::Message for PrimitiveBlock {
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
         self as &mut dyn (::std::any::Any)
     }
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -1021,10 +1013,8 @@ impl ::protobuf::Message for PrimitiveBlock {
     }
 
     fn default_instance() -> &'static PrimitiveBlock {
-        static mut instance: ::protobuf::lazy::Lazy<PrimitiveBlock> = ::protobuf::lazy::Lazy::INIT;
-        unsafe {
-            instance.get(PrimitiveBlock::new)
-        }
+        static instance: ::protobuf::rt::LazyV2<PrimitiveBlock> = ::protobuf::rt::LazyV2::INIT;
+        instance.get(PrimitiveBlock::new)
     }
 }
 
@@ -1049,11 +1039,11 @@ impl ::protobuf::reflect::ProtobufValue for PrimitiveBlock {
 #[derive(PartialEq,Clone,Default,Debug)]
 pub struct PrimitiveGroup {
     // message fields
-    nodes: ::protobuf::RepeatedField<Node>,
-    dense: ::protobuf::SingularPtrField<DenseNodes>,
-    ways: ::protobuf::RepeatedField<Way>,
-    relations: ::protobuf::RepeatedField<Relation>,
-    changesets: ::protobuf::RepeatedField<ChangeSet>,
+    pub nodes: ::protobuf::RepeatedField<Node>,
+    pub dense: ::protobuf::SingularPtrField<DenseNodes>,
+    pub ways: ::protobuf::RepeatedField<Way>,
+    pub relations: ::protobuf::RepeatedField<Relation>,
+    pub changesets: ::protobuf::RepeatedField<ChangeSet>,
     // special fields
     pub unknown_fields: ::protobuf::UnknownFields,
     pub cached_size: ::protobuf::CachedSize,
@@ -1099,7 +1089,7 @@ impl PrimitiveGroup {
 
 
     pub fn get_dense(&self) -> &DenseNodes {
-        self.dense.as_ref().unwrap_or_else(|| DenseNodes::default_instance())
+        self.dense.as_ref().unwrap_or_else(|| <DenseNodes as ::protobuf::Message>::default_instance())
     }
     pub fn clear_dense(&mut self) {
         self.dense.clear();
@@ -1338,7 +1328,7 @@ impl ::protobuf::Message for PrimitiveGroup {
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
         self as &mut dyn (::std::any::Any)
     }
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -1351,10 +1341,8 @@ impl ::protobuf::Message for PrimitiveGroup {
     }
 
     fn default_instance() -> &'static PrimitiveGroup {
-        static mut instance: ::protobuf::lazy::Lazy<PrimitiveGroup> = ::protobuf::lazy::Lazy::INIT;
-        unsafe {
-            instance.get(PrimitiveGroup::new)
-        }
+        static instance: ::protobuf::rt::LazyV2<PrimitiveGroup> = ::protobuf::rt::LazyV2::INIT;
+        instance.get(PrimitiveGroup::new)
     }
 }
 
@@ -1378,7 +1366,7 @@ impl ::protobuf::reflect::ProtobufValue for PrimitiveGroup {
 #[derive(PartialEq,Clone,Default,Debug)]
 pub struct StringTable {
     // message fields
-    s: ::protobuf::RepeatedField<::std::vec::Vec<u8>>,
+    pub s: ::protobuf::RepeatedField<::std::vec::Vec<u8>>,
     // special fields
     pub unknown_fields: ::protobuf::UnknownFields,
     pub cached_size: ::protobuf::CachedSize,
@@ -1479,7 +1467,7 @@ impl ::protobuf::Message for StringTable {
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
         self as &mut dyn (::std::any::Any)
     }
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -1492,10 +1480,8 @@ impl ::protobuf::Message for StringTable {
     }
 
     fn default_instance() -> &'static StringTable {
-        static mut instance: ::protobuf::lazy::Lazy<StringTable> = ::protobuf::lazy::Lazy::INIT;
-        unsafe {
-            instance.get(StringTable::new)
-        }
+        static instance: ::protobuf::rt::LazyV2<StringTable> = ::protobuf::rt::LazyV2::INIT;
+        instance.get(StringTable::new)
     }
 }
 
@@ -1779,7 +1765,7 @@ impl ::protobuf::Message for Info {
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
         self as &mut dyn (::std::any::Any)
     }
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -1792,10 +1778,8 @@ impl ::protobuf::Message for Info {
     }
 
     fn default_instance() -> &'static Info {
-        static mut instance: ::protobuf::lazy::Lazy<Info> = ::protobuf::lazy::Lazy::INIT;
-        unsafe {
-            instance.get(Info::new)
-        }
+        static instance: ::protobuf::rt::LazyV2<Info> = ::protobuf::rt::LazyV2::INIT;
+        instance.get(Info::new)
     }
 }
 
@@ -1820,12 +1804,12 @@ impl ::protobuf::reflect::ProtobufValue for Info {
 #[derive(PartialEq,Clone,Default,Debug)]
 pub struct DenseInfo {
     // message fields
-    version: ::std::vec::Vec<i32>,
-    timestamp: ::std::vec::Vec<i64>,
-    changeset: ::std::vec::Vec<i64>,
-    uid: ::std::vec::Vec<i32>,
-    user_sid: ::std::vec::Vec<i32>,
-    visible: ::std::vec::Vec<bool>,
+    pub version: ::std::vec::Vec<i32>,
+    pub timestamp: ::std::vec::Vec<i64>,
+    pub changeset: ::std::vec::Vec<i64>,
+    pub uid: ::std::vec::Vec<i32>,
+    pub user_sid: ::std::vec::Vec<i32>,
+    pub visible: ::std::vec::Vec<bool>,
     // special fields
     pub unknown_fields: ::protobuf::UnknownFields,
     pub cached_size: ::protobuf::CachedSize,
@@ -2126,7 +2110,7 @@ impl ::protobuf::Message for DenseInfo {
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
         self as &mut dyn (::std::any::Any)
     }
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -2139,10 +2123,8 @@ impl ::protobuf::Message for DenseInfo {
     }
 
     fn default_instance() -> &'static DenseInfo {
-        static mut instance: ::protobuf::lazy::Lazy<DenseInfo> = ::protobuf::lazy::Lazy::INIT;
-        unsafe {
-            instance.get(DenseInfo::new)
-        }
+        static instance: ::protobuf::rt::LazyV2<DenseInfo> = ::protobuf::rt::LazyV2::INIT;
+        instance.get(DenseInfo::new)
     }
 }
 
@@ -2269,7 +2251,7 @@ impl ::protobuf::Message for ChangeSet {
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
         self as &mut dyn (::std::any::Any)
     }
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -2282,10 +2264,8 @@ impl ::protobuf::Message for ChangeSet {
     }
 
     fn default_instance() -> &'static ChangeSet {
-        static mut instance: ::protobuf::lazy::Lazy<ChangeSet> = ::protobuf::lazy::Lazy::INIT;
-        unsafe {
-            instance.get(ChangeSet::new)
-        }
+        static instance: ::protobuf::rt::LazyV2<ChangeSet> = ::protobuf::rt::LazyV2::INIT;
+        instance.get(ChangeSet::new)
     }
 }
 
@@ -2306,9 +2286,9 @@ impl ::protobuf::reflect::ProtobufValue for ChangeSet {
 pub struct Node {
     // message fields
     id: ::std::option::Option<i64>,
-    keys: ::std::vec::Vec<u32>,
-    vals: ::std::vec::Vec<u32>,
-    info: ::protobuf::SingularPtrField<Info>,
+    pub keys: ::std::vec::Vec<u32>,
+    pub vals: ::std::vec::Vec<u32>,
+    pub info: ::protobuf::SingularPtrField<Info>,
     lat: ::std::option::Option<i64>,
     lon: ::std::option::Option<i64>,
     // special fields
@@ -2400,7 +2380,7 @@ impl Node {
 
 
     pub fn get_info(&self) -> &Info {
-        self.info.as_ref().unwrap_or_else(|| Info::default_instance())
+        self.info.as_ref().unwrap_or_else(|| <Info as ::protobuf::Message>::default_instance())
     }
     pub fn clear_info(&mut self) {
         self.info.clear();
@@ -2610,7 +2590,7 @@ impl ::protobuf::Message for Node {
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
         self as &mut dyn (::std::any::Any)
     }
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -2623,10 +2603,8 @@ impl ::protobuf::Message for Node {
     }
 
     fn default_instance() -> &'static Node {
-        static mut instance: ::protobuf::lazy::Lazy<Node> = ::protobuf::lazy::Lazy::INIT;
-        unsafe {
-            instance.get(Node::new)
-        }
+        static instance: ::protobuf::rt::LazyV2<Node> = ::protobuf::rt::LazyV2::INIT;
+        instance.get(Node::new)
     }
 }
 
@@ -2651,11 +2629,11 @@ impl ::protobuf::reflect::ProtobufValue for Node {
 #[derive(PartialEq,Clone,Default,Debug)]
 pub struct DenseNodes {
     // message fields
-    id: ::std::vec::Vec<i64>,
-    denseinfo: ::protobuf::SingularPtrField<DenseInfo>,
-    lat: ::std::vec::Vec<i64>,
-    lon: ::std::vec::Vec<i64>,
-    keys_vals: ::std::vec::Vec<i32>,
+    pub id: ::std::vec::Vec<i64>,
+    pub denseinfo: ::protobuf::SingularPtrField<DenseInfo>,
+    pub lat: ::std::vec::Vec<i64>,
+    pub lon: ::std::vec::Vec<i64>,
+    pub keys_vals: ::std::vec::Vec<i32>,
     // special fields
     pub unknown_fields: ::protobuf::UnknownFields,
     pub cached_size: ::protobuf::CachedSize,
@@ -2701,7 +2679,7 @@ impl DenseNodes {
 
 
     pub fn get_denseinfo(&self) -> &DenseInfo {
-        self.denseinfo.as_ref().unwrap_or_else(|| DenseInfo::default_instance())
+        self.denseinfo.as_ref().unwrap_or_else(|| <DenseInfo as ::protobuf::Message>::default_instance())
     }
     pub fn clear_denseinfo(&mut self) {
         self.denseinfo.clear();
@@ -2928,7 +2906,7 @@ impl ::protobuf::Message for DenseNodes {
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
         self as &mut dyn (::std::any::Any)
     }
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -2941,10 +2919,8 @@ impl ::protobuf::Message for DenseNodes {
     }
 
     fn default_instance() -> &'static DenseNodes {
-        static mut instance: ::protobuf::lazy::Lazy<DenseNodes> = ::protobuf::lazy::Lazy::INIT;
-        unsafe {
-            instance.get(DenseNodes::new)
-        }
+        static instance: ::protobuf::rt::LazyV2<DenseNodes> = ::protobuf::rt::LazyV2::INIT;
+        instance.get(DenseNodes::new)
     }
 }
 
@@ -2969,10 +2945,10 @@ impl ::protobuf::reflect::ProtobufValue for DenseNodes {
 pub struct Way {
     // message fields
     id: ::std::option::Option<i64>,
-    keys: ::std::vec::Vec<u32>,
-    vals: ::std::vec::Vec<u32>,
-    info: ::protobuf::SingularPtrField<Info>,
-    refs: ::std::vec::Vec<i64>,
+    pub keys: ::std::vec::Vec<u32>,
+    pub vals: ::std::vec::Vec<u32>,
+    pub info: ::protobuf::SingularPtrField<Info>,
+    pub refs: ::std::vec::Vec<i64>,
     // special fields
     pub unknown_fields: ::protobuf::UnknownFields,
     pub cached_size: ::protobuf::CachedSize,
@@ -3062,7 +3038,7 @@ impl Way {
 
 
     pub fn get_info(&self) -> &Info {
-        self.info.as_ref().unwrap_or_else(|| Info::default_instance())
+        self.info.as_ref().unwrap_or_else(|| <Info as ::protobuf::Message>::default_instance())
     }
     pub fn clear_info(&mut self) {
         self.info.clear();
@@ -3241,7 +3217,7 @@ impl ::protobuf::Message for Way {
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
         self as &mut dyn (::std::any::Any)
     }
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -3254,10 +3230,8 @@ impl ::protobuf::Message for Way {
     }
 
     fn default_instance() -> &'static Way {
-        static mut instance: ::protobuf::lazy::Lazy<Way> = ::protobuf::lazy::Lazy::INIT;
-        unsafe {
-            instance.get(Way::new)
-        }
+        static instance: ::protobuf::rt::LazyV2<Way> = ::protobuf::rt::LazyV2::INIT;
+        instance.get(Way::new)
     }
 }
 
@@ -3282,12 +3256,12 @@ impl ::protobuf::reflect::ProtobufValue for Way {
 pub struct Relation {
     // message fields
     id: ::std::option::Option<i64>,
-    keys: ::std::vec::Vec<u32>,
-    vals: ::std::vec::Vec<u32>,
-    info: ::protobuf::SingularPtrField<Info>,
-    roles_sid: ::std::vec::Vec<i32>,
-    memids: ::std::vec::Vec<i64>,
-    types: ::std::vec::Vec<Relation_MemberType>,
+    pub keys: ::std::vec::Vec<u32>,
+    pub vals: ::std::vec::Vec<u32>,
+    pub info: ::protobuf::SingularPtrField<Info>,
+    pub roles_sid: ::std::vec::Vec<i32>,
+    pub memids: ::std::vec::Vec<i64>,
+    pub types: ::std::vec::Vec<Relation_MemberType>,
     // special fields
     pub unknown_fields: ::protobuf::UnknownFields,
     pub cached_size: ::protobuf::CachedSize,
@@ -3377,7 +3351,7 @@ impl Relation {
 
 
     pub fn get_info(&self) -> &Info {
-        self.info.as_ref().unwrap_or_else(|| Info::default_instance())
+        self.info.as_ref().unwrap_or_else(|| <Info as ::protobuf::Message>::default_instance())
     }
     pub fn clear_info(&mut self) {
         self.info.clear();
@@ -3609,7 +3583,7 @@ impl ::protobuf::Message for Relation {
             // TODO: Data size is computed again, it should be cached
             os.write_raw_varint32(::protobuf::rt::vec_packed_enum_data_size(&self.types))?;
             for v in &self.types {
-                os.write_enum_no_tag(v.value())?;
+                os.write_enum_no_tag(::protobuf::ProtobufEnum::value(v))?;
             };
         }
         os.write_unknown_fields(self.get_unknown_fields())?;
@@ -3634,7 +3608,7 @@ impl ::protobuf::Message for Relation {
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
         self as &mut dyn (::std::any::Any)
     }
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -3647,10 +3621,8 @@ impl ::protobuf::Message for Relation {
     }
 
     fn default_instance() -> &'static Relation {
-        static mut instance: ::protobuf::lazy::Lazy<Relation> = ::protobuf::lazy::Lazy::INIT;
-        unsafe {
-            instance.get(Relation::new)
-        }
+        static instance: ::protobuf::rt::LazyV2<Relation> = ::protobuf::rt::LazyV2::INIT;
+        instance.get(Relation::new)
     }
 }
 
@@ -3715,6 +3687,6 @@ impl ::std::default::Default for Relation_MemberType {
 
 impl ::protobuf::reflect::ProtobufValue for Relation_MemberType {
     fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
-        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
+        ::protobuf::reflect::ReflectValueRef::Enum(::protobuf::ProtobufEnum::descriptor(self))
     }
 }