.appveyor.yml

@@ -8,20 +8,15 @@ environment:
   matrix:
     - channel: nightly
       target: x86_64-pc-windows-msvc
-      cargoflags: --no-default-features
     - channel: nightly
       target: x86_64-pc-windows-gnu
-      cargoflags: --no-default-features
     - channel: nightly
       target: i686-pc-windows-gnu
-      cargoflags: --no-default-features
     - channel: stable
       target: x86_64-pc-windows-msvc
-      cargoflags: --no-default-features
     - channel: stable
       target: i686-pc-windows-msvc
-      cargoflags: --no-default-features
-    - channel: 1.24.1
+    - channel: 1.34.2
       target: x86_64-pc-windows-msvc
 
 install:
@@ -41,4 +36,4 @@ build: false
 
 test_script:
   - cargo test --verbose
-  - cargo test --verbose %cargoflags%
+  - cargo test --verbose --no-default-features

.travis.yml

@@ -1,19 +1,13 @@
 dist: trusty
 sudo: false
 language: rust
-cache: cargo
 rust:
   - stable
   - beta
   - nightly
-  - 1.24.1
+  - 1.34.2
 script:
   - |
-      if [ "$TRAVIS_RUST_VERSION" == "1.24.1" ]; then
-        cargo test --verbose;
-        cargo doc --verbose --no-deps;
-      else
-        cargo test --verbose;
-        cargo test --verbose --no-default-features;
-        cargo doc --verbose;
-      fi
+      cargo test --verbose;
+      cargo test --verbose --no-default-features;
+      cargo doc --verbose;

src/error.rs

@@ -116,7 +116,7 @@ impl StdError for Error {
         }
     }
 
-    fn cause(&self) -> Option<&StdError> {
+    fn cause(&self) -> Option<&dyn StdError> {
         match *self.0 {
             ErrorKind::Io(ref err) => Some(err),
             ErrorKind::Protobuf{ref err, ..} => Some(err),

src/mmap_blob.rs

@@ -190,7 +190,7 @@ impl<'a> Iterator for MmapBlobReader<'a> {
 
         match slice.len() {
             0 => return None,
-            1 ... 3 => {
+            1 ..= 3 => {
                 self.last_blob_ok = false;
                 return Some(Err(new_blob_error(BlobError::InvalidHeaderSize)));
             },

src/proto/fileformat.rs

@@ -1,9 +1,9 @@
-// This file is generated by rust-protobuf 2.0.0. Do not edit
+// This file is generated by rust-protobuf 2.8.1. Do not edit
 // @generated
 
 // https://github.com/Manishearth/rust-clippy/issues/702
 #![allow(unknown_lints)]
-#![allow(clippy)]
+#![allow(clippy::all)]
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 
@@ -17,10 +17,15 @@
 #![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_8_1;
+
 #[derive(PartialEq,Clone,Default,Debug)]
 pub struct Blob {
     // message fields
@@ -30,8 +35,14 @@ pub struct Blob {
     lzma_data: ::protobuf::SingularField<::std::vec::Vec<u8>>,
     OBSOLETE_bzip2_data: ::protobuf::SingularField<::std::vec::Vec<u8>>,
     // special fields
-    unknown_fields: ::protobuf::UnknownFields,
-    cached_size: ::protobuf::CachedSize,
+    pub unknown_fields: ::protobuf::UnknownFields,
+    pub cached_size: ::protobuf::CachedSize,
+}
+
+impl<'a> ::std::default::Default for &'a Blob {
+    fn default() -> &'a Blob {
+        <Blob as ::protobuf::Message>::default_instance()
+    }
 }
 
 impl Blob {
@@ -41,6 +52,13 @@ impl Blob {
 
     // optional bytes raw = 1;
 
+
+    pub fn get_raw(&self) -> &[u8] {
+        match self.raw.as_ref() {
+            Some(v) => &v,
+            None => &[],
+        }
+    }
     pub fn clear_raw(&mut self) {
         self.raw.clear();
     }
@@ -68,15 +86,12 @@ impl Blob {
         self.raw.take().unwrap_or_else(|| ::std::vec::Vec::new())
     }
 
-    pub fn get_raw(&self) -> &[u8] {
-        match self.raw.as_ref() {
-            Some(v) => &v,
-            None => &[],
-        }
-    }
-
     // optional int32 raw_size = 2;
 
+
+    pub fn get_raw_size(&self) -> i32 {
+        self.raw_size.unwrap_or(0)
+    }
     pub fn clear_raw_size(&mut self) {
         self.raw_size = ::std::option::Option::None;
     }
@@ -90,12 +105,15 @@ impl Blob {
         self.raw_size = ::std::option::Option::Some(v);
     }
 
-    pub fn get_raw_size(&self) -> i32 {
-        self.raw_size.unwrap_or(0)
-    }
-
     // optional bytes zlib_data = 3;
 
+
+    pub fn get_zlib_data(&self) -> &[u8] {
+        match self.zlib_data.as_ref() {
+            Some(v) => &v,
+            None => &[],
+        }
+    }
     pub fn clear_zlib_data(&mut self) {
         self.zlib_data.clear();
     }
@@ -123,15 +141,15 @@ impl Blob {
         self.zlib_data.take().unwrap_or_else(|| ::std::vec::Vec::new())
     }
 
-    pub fn get_zlib_data(&self) -> &[u8] {
-        match self.zlib_data.as_ref() {
+    // optional bytes lzma_data = 4;
+
+
+    pub fn get_lzma_data(&self) -> &[u8] {
+        match self.lzma_data.as_ref() {
             Some(v) => &v,
             None => &[],
         }
     }
-
-    // optional bytes lzma_data = 4;
-
     pub fn clear_lzma_data(&mut self) {
         self.lzma_data.clear();
     }
@@ -159,15 +177,15 @@ impl Blob {
         self.lzma_data.take().unwrap_or_else(|| ::std::vec::Vec::new())
     }
 
-    pub fn get_lzma_data(&self) -> &[u8] {
-        match self.lzma_data.as_ref() {
+    // optional bytes OBSOLETE_bzip2_data = 5;
+
+
+    pub fn get_OBSOLETE_bzip2_data(&self) -> &[u8] {
+        match self.OBSOLETE_bzip2_data.as_ref() {
             Some(v) => &v,
             None => &[],
         }
     }
-
-    // optional bytes OBSOLETE_bzip2_data = 5;
-
     pub fn clear_OBSOLETE_bzip2_data(&mut self) {
         self.OBSOLETE_bzip2_data.clear();
     }
@@ -194,13 +212,6 @@ impl Blob {
     pub fn take_OBSOLETE_bzip2_data(&mut self) -> ::std::vec::Vec<u8> {
         self.OBSOLETE_bzip2_data.take().unwrap_or_else(|| ::std::vec::Vec::new())
     }
-
-    pub fn get_OBSOLETE_bzip2_data(&self) -> &[u8] {
-        match self.OBSOLETE_bzip2_data.as_ref() {
-            Some(v) => &v,
-            None => &[],
-        }
-    }
 }
 
 impl ::protobuf::Message for Blob {
@@ -208,7 +219,7 @@ impl ::protobuf::Message for Blob {
         true
     }
 
-    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> {
+    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> {
         while !is.eof()? {
             let (field_number, wire_type) = is.read_tag_unpack()?;
             match field_number {
@@ -263,7 +274,7 @@ impl ::protobuf::Message for Blob {
         my_size
     }
 
-    fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> {
+    fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> {
         if let Some(ref v) = self.raw.as_ref() {
             os.write_bytes(1, &v)?;
         }
@@ -295,13 +306,13 @@ impl ::protobuf::Message for Blob {
         &mut self.unknown_fields
     }
 
-    fn as_any(&self) -> &::std::any::Any {
-        self as &::std::any::Any
+    fn as_any(&self) -> &dyn (::std::any::Any) {
+        self as &dyn (::std::any::Any)
     }
-    fn as_any_mut(&mut self) -> &mut ::std::any::Any {
-        self as &mut ::std::any::Any
+    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<::std::any::Any> {
+    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -326,11 +337,11 @@ impl ::protobuf::Message for Blob {
 
 impl ::protobuf::Clear for Blob {
     fn clear(&mut self) {
-        self.clear_raw();
-        self.clear_raw_size();
-        self.clear_zlib_data();
-        self.clear_lzma_data();
-        self.clear_OBSOLETE_bzip2_data();
+        self.raw.clear();
+        self.raw_size = ::std::option::Option::None;
+        self.zlib_data.clear();
+        self.lzma_data.clear();
+        self.OBSOLETE_bzip2_data.clear();
         self.unknown_fields.clear();
     }
 }
@@ -348,8 +359,14 @@ pub struct BlobHeader {
     indexdata: ::protobuf::SingularField<::std::vec::Vec<u8>>,
     datasize: ::std::option::Option<i32>,
     // special fields
-    unknown_fields: ::protobuf::UnknownFields,
-    cached_size: ::protobuf::CachedSize,
+    pub unknown_fields: ::protobuf::UnknownFields,
+    pub cached_size: ::protobuf::CachedSize,
+}
+
+impl<'a> ::std::default::Default for &'a BlobHeader {
+    fn default() -> &'a BlobHeader {
+        <BlobHeader as ::protobuf::Message>::default_instance()
+    }
 }
 
 impl BlobHeader {
@@ -359,6 +376,13 @@ impl BlobHeader {
 
     // required string type = 1;
 
+
+    pub fn get_field_type(&self) -> &str {
+        match self.field_type.as_ref() {
+            Some(v) => &v,
+            None => "",
+        }
+    }
     pub fn clear_field_type(&mut self) {
         self.field_type.clear();
     }
@@ -386,15 +410,15 @@ impl BlobHeader {
         self.field_type.take().unwrap_or_else(|| ::std::string::String::new())
     }
 
-    pub fn get_field_type(&self) -> &str {
-        match self.field_type.as_ref() {
+    // optional bytes indexdata = 2;
+
+
+    pub fn get_indexdata(&self) -> &[u8] {
+        match self.indexdata.as_ref() {
             Some(v) => &v,
-            None => "",
+            None => &[],
         }
     }
-
-    // optional bytes indexdata = 2;
-
     pub fn clear_indexdata(&mut self) {
         self.indexdata.clear();
     }
@@ -422,15 +446,12 @@ impl BlobHeader {
         self.indexdata.take().unwrap_or_else(|| ::std::vec::Vec::new())
     }
 
-    pub fn get_indexdata(&self) -> &[u8] {
-        match self.indexdata.as_ref() {
-            Some(v) => &v,
-            None => &[],
-        }
-    }
-
     // required int32 datasize = 3;
 
+
+    pub fn get_datasize(&self) -> i32 {
+        self.datasize.unwrap_or(0)
+    }
     pub fn clear_datasize(&mut self) {
         self.datasize = ::std::option::Option::None;
     }
@@ -443,10 +464,6 @@ impl BlobHeader {
     pub fn set_datasize(&mut self, v: i32) {
         self.datasize = ::std::option::Option::Some(v);
     }
-
-    pub fn get_datasize(&self) -> i32 {
-        self.datasize.unwrap_or(0)
-    }
 }
 
 impl ::protobuf::Message for BlobHeader {
@@ -460,7 +477,7 @@ impl ::protobuf::Message for BlobHeader {
         true
     }
 
-    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> {
+    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> {
         while !is.eof()? {
             let (field_number, wire_type) = is.read_tag_unpack()?;
             match field_number {
@@ -503,7 +520,7 @@ impl ::protobuf::Message for BlobHeader {
         my_size
     }
 
-    fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> {
+    fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> {
         if let Some(ref v) = self.field_type.as_ref() {
             os.write_string(1, &v)?;
         }
@@ -529,13 +546,13 @@ impl ::protobuf::Message for BlobHeader {
         &mut self.unknown_fields
     }
 
-    fn as_any(&self) -> &::std::any::Any {
-        self as &::std::any::Any
+    fn as_any(&self) -> &dyn (::std::any::Any) {
+        self as &dyn (::std::any::Any)
     }
-    fn as_any_mut(&mut self) -> &mut ::std::any::Any {
-        self as &mut ::std::any::Any
+    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<::std::any::Any> {
+    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
         self
     }
 
@@ -560,9 +577,9 @@ impl ::protobuf::Message for BlobHeader {
 
 impl ::protobuf::Clear for BlobHeader {
     fn clear(&mut self) {
-        self.clear_field_type();
-        self.clear_indexdata();
-        self.clear_datasize();
+        self.field_type.clear();
+        self.indexdata.clear();
+        self.datasize = ::std::option::Option::None;
         self.unknown_fields.clear();
     }
 }