Merge pull request #55 from danielrh/master

Fix q9 compression

Author: lesniewski

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "brotli"
-version = "3.3.0"
+version = "3.3.1"
 authors = ["Daniel Reiter Horn <[email protected]>", "The Brotli Authors"]
 description = "A brotli compressor and decompressor that with an interface avoiding the rust stdlib. This makes it suitable for embedded devices and kernels. It is designed with a pluggable allocator so that the standard lib's allocator may be employed. The default build also includes a stdlib allocator and stream interface. Disable this with --features=no-stdlib. All included code is safe."
 license = "BSD-3-Clause/MIT"

examples/compress.rs

@@ -21,7 +21,7 @@ fn main() {
                     if let io::ErrorKind::Interrupted = e.kind() {
                         continue;
                     }
-                    panic!(e);
+                    panic!("{}", e);
                 }
                 Ok(size) => {
                     if size == 0 {
@@ -30,13 +30,13 @@ fn main() {
                                 if let io::ErrorKind::Interrupted = e.kind() {
                                     continue;
                                 }
-                                panic!(e)
+                                panic!("{}", e)
                             }
                             Ok(_) => break,
                         }
                     }
                     match writer.write_all(&buf[..size]) {
-                        Err(e) => panic!(e),
+                        Err(e) => panic!("{}", e),
                         Ok(_) => {},
                     }
                 }

examples/decompress.rs

@@ -20,14 +20,14 @@ fn main() {
                     if let io::ErrorKind::Interrupted = e.kind() {
                         continue;
                     }
-                    panic!(e);
+                    panic!("{}", e);
                 }
                 Ok(size) => {
                     if size == 0 {
                         break;
                     }
                     match io::stdout().write_all(&buf[..size]) {
-                        Err(e) => panic!(e),
+                        Err(e) => panic!("{}", e),
                         Ok(_) => {},
                     }
                 }

src/bin/catbrotli.rs

@@ -89,7 +89,7 @@ fn main() {
         loop {
             ioffset = 0;
             match read_no_interrupt(&mut input_file, &mut ibuffer[..]) {
-                Err(e) => panic!(e),
+                Err(e) => panic!("{}", e),
                 Ok(cur_read) => {
                     if cur_read == 0 {
                         break;
@@ -142,7 +142,7 @@ fn main() {
                 break;
             }
             failure => {
-                panic!(failure)
+                panic!("{:?}", failure)
             }
         }
     }

src/bin/integration_tests.rs

@@ -143,12 +143,12 @@ fn decompress_internal<InputType, OutputType, Run: Runner>(r: &mut InputType,
             Err(e) => {
               match e.kind() {
                 io::ErrorKind::Interrupted => continue,
-                _ => panic!(e),
+                _ => panic!("{}", e),
               }
             }
             Ok(size) => {
               if size == 0 {
-                panic!(io::Error::new(io::ErrorKind::UnexpectedEof, "Read EOF"));
+                panic!("{:?}", io::Error::new(io::ErrorKind::UnexpectedEof, "Read EOF"));
               }
               available_in = size;
             }
@@ -385,7 +385,7 @@ fn test_random_then_unicode_9() {
     roundtrip_helper(RANDOM_THEN_UNICODE, 9, 22, false);
 }
 #[cfg(feature="std")]
-const random_then_unicode_compressed_size_9_5 : usize = 136563;
+const random_then_unicode_compressed_size_9_5 : usize = 136542;
 #[cfg(feature="std")]
 const random_then_unicode_compressed_size_9_5x : usize = 136045;
 

src/bin/test_broccoli.rs

@@ -40,7 +40,7 @@ fn concat(files:&mut [UnlimitedBuffer],
           loop {
             ioffset = 0;
             match input.read(&mut ibuffer[..]) {
-              Err(e) => panic!(e),
+              Err(e) => panic!("{}", e),
               Ok(cur_read) => {
                 if cur_read == 0 {
                   break;
@@ -62,7 +62,7 @@ fn concat(files:&mut [UnlimitedBuffer],
                       panic!("Unexpected state: Success when streaming before finish");
                     },
                     failure => {
-                      panic!(failure);
+                      panic!("{:?}", failure);
                     },
                   }
                 }
@@ -94,7 +94,7 @@ fn concat(files:&mut [UnlimitedBuffer],
           break;
         }
         failure => {
-          panic!(failure)
+          panic!("{:?}", failure)
         }
       }
     }

src/bin/test_custom_dict.rs

@@ -113,11 +113,11 @@ fn test_custom_dict_for_multithreading() {
     for brotli in brs.iter_mut() {
         brotli.reset_read();
         bro_cat_li.new_brotli_file();
-        let mut input = brotli;
+        let input = brotli;
         loop {
             let mut ioffset = 0usize;
             match input.read(&mut ibuffer[..]) {
-                Err(e) => panic!(e),
+                Err(e) => panic!("{:?}", e),
                 Ok(cur_read) => {
                     if cur_read == 0 {
                         break;
@@ -139,7 +139,7 @@ fn test_custom_dict_for_multithreading() {
                                 panic!("Unexpected state: Success when streaming before finish");
                             },
                             failure => {
-                                panic!(failure);
+                                panic!("{:?}", failure);
                             },
                         }
                     }
@@ -169,7 +169,7 @@ fn test_custom_dict_for_multithreading() {
                 break;
             }
             failure => {
-                panic!(failure)
+                panic!("{}", failure as i32)
             }
         }
     }

src/bin/util.rs

@@ -32,7 +32,9 @@ struct HexSlice<'a>(&'a [u8]);
 impl<'a> fmt::Display for HexSlice<'a> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         for byte in self.0 {
-            try!(write!(f, "{:02X}", byte));
+            if let Err(e) = write!(f, "{:02X}", byte) {
+                return Err(e);
+            }
         }
         Ok(())
     }
@@ -83,7 +85,9 @@ struct SliceU8Ref<'a>(pub &'a[u8]);
 impl<'a> fmt::LowerHex for SliceU8Ref<'a> {
     fn fmt(&self, fmtr: &mut fmt::Formatter) -> Result<(), fmt::Error> {
         for item in self.0 {
-            try!( fmtr.write_fmt(format_args!("{:02x}", item)));
+            if let Err(e) = fmtr.write_fmt(format_args!("{:02x}", item)) {
+                return Err(e);
+            }
         }
         Ok(())
     }

src/concat/mod.rs

@@ -2,7 +2,6 @@ use core;
 
 #[repr(C)]
 #[derive(Debug,Clone,Copy, PartialEq)]
-#[no_mangle]
 pub enum BroCatliResult {
   Success = 0,
   NeedsMoreInput = 1,