Update to protobuf 1.6, regenerate files

Cargo.toml

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

src/blob.rs

@@ -218,7 +218,7 @@ impl<R: Read> Iterator for BlobReader<R> {
 
 #[cfg(feature = "system-libz")]
 pub(crate) fn decode_blob<T>(blob: &fileformat::Blob) -> Result<T>
-    where T: protobuf::Message + protobuf::MessageStatic {
+    where T: protobuf::Message {
     if blob.has_raw() {
         let size = blob.get_raw().len() as u64;
         if size < MAX_BLOB_MESSAGE_SIZE {
@@ -237,7 +237,7 @@ pub(crate) fn decode_blob<T>(blob: &fileformat::Blob) -> Result<T>
 
 #[cfg(not(feature = "system-libz"))]
 pub(crate) fn decode_blob<T>(blob: &fileformat::Blob) -> Result<T>
-    where T: protobuf::Message + protobuf::MessageStatic {
+    where T: protobuf::Message {
     if blob.has_raw() {
         let size = blob.get_raw().len() as u64;
         if size < MAX_BLOB_MESSAGE_SIZE {

src/proto/fileformat.rs

@@ -1,4 +1,4 @@
-// This file is generated. Do not edit
+// This file is generated by rust-protobuf 1.6.0. Do not edit
 // @generated
 
 // https://github.com/Manishearth/rust-clippy/issues/702
@@ -34,24 +34,11 @@ pub struct Blob {
     cached_size: ::protobuf::CachedSize,
 }
 
-// see codegen.rs for the explanation why impl Sync explicitly
-unsafe impl ::std::marker::Sync for Blob {}
-
 impl Blob {
     pub fn new() -> Blob {
         ::std::default::Default::default()
     }
 
-    pub 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,
-        };
-        unsafe {
-            instance.get(Blob::new)
-        }
-    }
-
     // optional bytes raw = 1;
 
     pub fn clear_raw(&mut self) {
@@ -88,14 +75,6 @@ impl Blob {
         }
     }
 
-    fn get_raw_for_reflect(&self) -> &::protobuf::SingularField<::std::vec::Vec<u8>> {
-        &self.raw
-    }
-
-    fn mut_raw_for_reflect(&mut self) -> &mut ::protobuf::SingularField<::std::vec::Vec<u8>> {
-        &mut self.raw
-    }
-
     // optional int32 raw_size = 2;
 
     pub fn clear_raw_size(&mut self) {
@@ -115,14 +94,6 @@ impl Blob {
         self.raw_size.unwrap_or(0)
     }
 
-    fn get_raw_size_for_reflect(&self) -> &::std::option::Option<i32> {
-        &self.raw_size
-    }
-
-    fn mut_raw_size_for_reflect(&mut self) -> &mut ::std::option::Option<i32> {
-        &mut self.raw_size
-    }
-
     // optional bytes zlib_data = 3;
 
     pub fn clear_zlib_data(&mut self) {
@@ -159,14 +130,6 @@ impl Blob {
         }
     }
 
-    fn get_zlib_data_for_reflect(&self) -> &::protobuf::SingularField<::std::vec::Vec<u8>> {
-        &self.zlib_data
-    }
-
-    fn mut_zlib_data_for_reflect(&mut self) -> &mut ::protobuf::SingularField<::std::vec::Vec<u8>> {
-        &mut self.zlib_data
-    }
-
     // optional bytes lzma_data = 4;
 
     pub fn clear_lzma_data(&mut self) {
@@ -203,14 +166,6 @@ impl Blob {
         }
     }
 
-    fn get_lzma_data_for_reflect(&self) -> &::protobuf::SingularField<::std::vec::Vec<u8>> {
-        &self.lzma_data
-    }
-
-    fn mut_lzma_data_for_reflect(&mut self) -> &mut ::protobuf::SingularField<::std::vec::Vec<u8>> {
-        &mut self.lzma_data
-    }
-
     // optional bytes OBSOLETE_bzip2_data = 5;
 
     pub fn clear_OBSOLETE_bzip2_data(&mut self) {
@@ -246,14 +201,6 @@ impl Blob {
             None => &[],
         }
     }
-
-    fn get_OBSOLETE_bzip2_data_for_reflect(&self) -> &::protobuf::SingularField<::std::vec::Vec<u8>> {
-        &self.OBSOLETE_bzip2_data
-    }
-
-    fn mut_OBSOLETE_bzip2_data_for_reflect(&mut self) -> &mut ::protobuf::SingularField<::std::vec::Vec<u8>> {
-        &mut self.OBSOLETE_bzip2_data
-    }
 }
 
 impl ::protobuf::Message for Blob {
@@ -359,14 +306,22 @@ impl ::protobuf::Message for Blob {
     }
 
     fn descriptor(&self) -> &'static ::protobuf::reflect::MessageDescriptor {
-        ::protobuf::MessageStatic::descriptor_static(None::<Self>)
+        Self::descriptor_static()
     }
-}
 
-impl ::protobuf::MessageStatic for Blob {
     fn new() -> Blob {
         Blob::new()
     }
+
+    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,
+        };
+        unsafe {
+            instance.get(Blob::new)
+        }
+    }
 }
 
 impl ::protobuf::Clear for Blob {
@@ -397,24 +352,11 @@ pub struct BlobHeader {
     cached_size: ::protobuf::CachedSize,
 }
 
-// see codegen.rs for the explanation why impl Sync explicitly
-unsafe impl ::std::marker::Sync for BlobHeader {}
-
 impl BlobHeader {
     pub fn new() -> BlobHeader {
         ::std::default::Default::default()
     }
 
-    pub 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,
-        };
-        unsafe {
-            instance.get(BlobHeader::new)
-        }
-    }
-
     // required string type = 1;
 
     pub fn clear_field_type(&mut self) {
@@ -451,14 +393,6 @@ impl BlobHeader {
         }
     }
 
-    fn get_field_type_for_reflect(&self) -> &::protobuf::SingularField<::std::string::String> {
-        &self.field_type
-    }
-
-    fn mut_field_type_for_reflect(&mut self) -> &mut ::protobuf::SingularField<::std::string::String> {
-        &mut self.field_type
-    }
-
     // optional bytes indexdata = 2;
 
     pub fn clear_indexdata(&mut self) {
@@ -495,14 +429,6 @@ impl BlobHeader {
         }
     }
 
-    fn get_indexdata_for_reflect(&self) -> &::protobuf::SingularField<::std::vec::Vec<u8>> {
-        &self.indexdata
-    }
-
-    fn mut_indexdata_for_reflect(&mut self) -> &mut ::protobuf::SingularField<::std::vec::Vec<u8>> {
-        &mut self.indexdata
-    }
-
     // required int32 datasize = 3;
 
     pub fn clear_datasize(&mut self) {
@@ -521,14 +447,6 @@ impl BlobHeader {
     pub fn get_datasize(&self) -> i32 {
         self.datasize.unwrap_or(0)
     }
-
-    fn get_datasize_for_reflect(&self) -> &::std::option::Option<i32> {
-        &self.datasize
-    }
-
-    fn mut_datasize_for_reflect(&mut self) -> &mut ::std::option::Option<i32> {
-        &mut self.datasize
-    }
 }
 
 impl ::protobuf::Message for BlobHeader {
@@ -622,14 +540,22 @@ impl ::protobuf::Message for BlobHeader {
     }
 
     fn descriptor(&self) -> &'static ::protobuf::reflect::MessageDescriptor {
-        ::protobuf::MessageStatic::descriptor_static(None::<Self>)
+        Self::descriptor_static()
     }
-}
 
-impl ::protobuf::MessageStatic for BlobHeader {
     fn new() -> BlobHeader {
         BlobHeader::new()
     }
+
+    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,
+        };
+        unsafe {
+            instance.get(BlobHeader::new)
+        }
+    }
 }
 
 impl ::protobuf::Clear for BlobHeader {

src/util.rs

@@ -3,10 +3,10 @@ use std::io::Read;
 
 
 pub(crate) fn parse_message_from_bytes<M>(bytes: &[u8]) -> Result<M>
-    where M: ::protobuf::Message + ::protobuf::MessageStatic
+    where M: ::protobuf::Message
 {
     let mut stream = ::protobuf::CodedInputStream::from_bytes(bytes);
-    let mut message: M = ::protobuf::MessageStatic::new();
+    let mut message: M = ::protobuf::Message::new();
     message.merge_from(&mut stream)?;
 
     if message.is_initialized() {
@@ -18,10 +18,10 @@ pub(crate) fn parse_message_from_bytes<M>(bytes: &[u8]) -> Result<M>
 
 pub(crate) fn parse_message_from_reader<R, M>(reader: &mut R) -> Result<M>
     where R: Read,
-          M: ::protobuf::Message + ::protobuf::MessageStatic,
+          M: ::protobuf::Message,
 {
     let mut stream = ::protobuf::CodedInputStream::new(reader);
-    let mut message: M = ::protobuf::MessageStatic::new();
+    let mut message: M = ::protobuf::Message::new();
     message.merge_from(&mut stream)?;
 
     stream.check_eof()?;