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

for new protobuf version 2.14.0 and remove exact version requirement for
protobuf.

Cargo.toml

@@ -21,7 +21,7 @@ default = ["system-libz"]
 system-libz = ["flate2"]
 
 [dependencies]
-protobuf = "=2.10.1"
+protobuf = "2.14"
 byteorder = "1.1"
 flate2 = { version = "1.0", optional = true }
 inflate = "0.4"

src/proto/fileformat.rs

@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.10.1. Do not edit
+// This file is generated by rust-protobuf 2.14.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -24,7 +24,7 @@ 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_10_1;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0;
 
 #[derive(PartialEq,Clone,Default,Debug)]
 pub struct Blob {
@@ -325,10 +325,7 @@ impl ::protobuf::Message for Blob {
     }
 
     fn default_instance() -> &'static Blob {
-        static mut instance: ::protobuf::lazy::Lazy<Blob> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Blob,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Blob> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Blob::new)
         }
@@ -347,8 +344,8 @@ impl ::protobuf::Clear for Blob {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Blob {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -565,10 +562,7 @@ impl ::protobuf::Message for BlobHeader {
     }
 
     fn default_instance() -> &'static BlobHeader {
-        static mut instance: ::protobuf::lazy::Lazy<BlobHeader> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const BlobHeader,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<BlobHeader> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(BlobHeader::new)
         }
@@ -585,7 +579,7 @@ impl ::protobuf::Clear for BlobHeader {
 }
 
 impl ::protobuf::reflect::ProtobufValue for BlobHeader {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }

src/proto/osmformat.rs

@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.10.1. Do not edit
+// This file is generated by rust-protobuf 2.14.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -24,7 +24,7 @@ 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_10_1;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0;
 
 #[derive(PartialEq,Clone,Default,Debug)]
 pub struct HeaderBlock {
@@ -433,10 +433,7 @@ impl ::protobuf::Message for HeaderBlock {
     }
 
     fn default_instance() -> &'static HeaderBlock {
-        static mut instance: ::protobuf::lazy::Lazy<HeaderBlock> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const HeaderBlock,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<HeaderBlock> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(HeaderBlock::new)
         }
@@ -458,8 +455,8 @@ impl ::protobuf::Clear for HeaderBlock {
 }
 
 impl ::protobuf::reflect::ProtobufValue for HeaderBlock {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -689,10 +686,7 @@ impl ::protobuf::Message for HeaderBBox {
     }
 
     fn default_instance() -> &'static HeaderBBox {
-        static mut instance: ::protobuf::lazy::Lazy<HeaderBBox> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const HeaderBBox,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<HeaderBBox> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(HeaderBBox::new)
         }
@@ -710,8 +704,8 @@ impl ::protobuf::Clear for HeaderBBox {
 }
 
 impl ::protobuf::reflect::ProtobufValue for HeaderBBox {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1026,10 +1020,7 @@ impl ::protobuf::Message for PrimitiveBlock {
     }
 
     fn default_instance() -> &'static PrimitiveBlock {
-        static mut instance: ::protobuf::lazy::Lazy<PrimitiveBlock> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const PrimitiveBlock,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<PrimitiveBlock> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(PrimitiveBlock::new)
         }
@@ -1049,8 +1040,8 @@ impl ::protobuf::Clear for PrimitiveBlock {
 }
 
 impl ::protobuf::reflect::ProtobufValue for PrimitiveBlock {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1359,10 +1350,7 @@ impl ::protobuf::Message for PrimitiveGroup {
     }
 
     fn default_instance() -> &'static PrimitiveGroup {
-        static mut instance: ::protobuf::lazy::Lazy<PrimitiveGroup> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const PrimitiveGroup,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<PrimitiveGroup> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(PrimitiveGroup::new)
         }
@@ -1381,8 +1369,8 @@ impl ::protobuf::Clear for PrimitiveGroup {
 }
 
 impl ::protobuf::reflect::ProtobufValue for PrimitiveGroup {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1503,10 +1491,7 @@ impl ::protobuf::Message for StringTable {
     }
 
     fn default_instance() -> &'static StringTable {
-        static mut instance: ::protobuf::lazy::Lazy<StringTable> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const StringTable,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<StringTable> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(StringTable::new)
         }
@@ -1521,8 +1506,8 @@ impl ::protobuf::Clear for StringTable {
 }
 
 impl ::protobuf::reflect::ProtobufValue for StringTable {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1806,10 +1791,7 @@ impl ::protobuf::Message for Info {
     }
 
     fn default_instance() -> &'static Info {
-        static mut instance: ::protobuf::lazy::Lazy<Info> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Info,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Info> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Info::new)
         }
@@ -1829,8 +1811,8 @@ impl ::protobuf::Clear for Info {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Info {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2156,10 +2138,7 @@ impl ::protobuf::Message for DenseInfo {
     }
 
     fn default_instance() -> &'static DenseInfo {
-        static mut instance: ::protobuf::lazy::Lazy<DenseInfo> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const DenseInfo,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<DenseInfo> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(DenseInfo::new)
         }
@@ -2179,8 +2158,8 @@ impl ::protobuf::Clear for DenseInfo {
 }
 
 impl ::protobuf::reflect::ProtobufValue for DenseInfo {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2302,10 +2281,7 @@ impl ::protobuf::Message for ChangeSet {
     }
 
     fn default_instance() -> &'static ChangeSet {
-        static mut instance: ::protobuf::lazy::Lazy<ChangeSet> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ChangeSet,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ChangeSet> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ChangeSet::new)
         }
@@ -2320,8 +2296,8 @@ impl ::protobuf::Clear for ChangeSet {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ChangeSet {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2646,10 +2622,7 @@ impl ::protobuf::Message for Node {
     }
 
     fn default_instance() -> &'static Node {
-        static mut instance: ::protobuf::lazy::Lazy<Node> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Node,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Node> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Node::new)
         }
@@ -2669,8 +2642,8 @@ impl ::protobuf::Clear for Node {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Node {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2967,10 +2940,7 @@ impl ::protobuf::Message for DenseNodes {
     }
 
     fn default_instance() -> &'static DenseNodes {
-        static mut instance: ::protobuf::lazy::Lazy<DenseNodes> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const DenseNodes,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<DenseNodes> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(DenseNodes::new)
         }
@@ -2989,8 +2959,8 @@ impl ::protobuf::Clear for DenseNodes {
 }
 
 impl ::protobuf::reflect::ProtobufValue for DenseNodes {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3283,10 +3253,7 @@ impl ::protobuf::Message for Way {
     }
 
     fn default_instance() -> &'static Way {
-        static mut instance: ::protobuf::lazy::Lazy<Way> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Way,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Way> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Way::new)
         }
@@ -3305,8 +3272,8 @@ impl ::protobuf::Clear for Way {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Way {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3679,10 +3646,7 @@ impl ::protobuf::Message for Relation {
     }
 
     fn default_instance() -> &'static Relation {
-        static mut instance: ::protobuf::lazy::Lazy<Relation> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Relation,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Relation> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Relation::new)
         }
@@ -3703,8 +3667,8 @@ impl ::protobuf::Clear for Relation {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Relation {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3749,7 +3713,7 @@ impl ::std::default::Default for Relation_MemberType {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Relation_MemberType {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }