Merge pull request #182 from nyurik/fmt2

Reorganize `use` statements, rm `unused_imports`

Author: danielrh

c/src/lib.rs

@@ -1,18 +1,19 @@
 #![no_std]
 #![cfg_attr(not(feature = "std"), feature(lang_items))]
+
+pub extern crate brotli;
 #[cfg(feature = "std")]
 extern crate std;
 
-pub extern crate brotli;
-pub use brotli::ffi::compressor::*;
+use core::ptr::null_mut;
 
+pub use brotli::ffi::compressor::*;
 // FIXME: this is just wrong, and needs to be fixed
 #[allow(unknown_lints, ambiguous_glob_reexports)]
 pub use brotli::ffi::decompressor::*;
-
 pub use brotli::ffi::multicompress::*;
 pub use brotli::*;
-use core::ptr::null_mut;
+
 #[cfg(feature = "std")]
 unsafe fn std_only_functions() {
     let _ =

justfile

@@ -32,6 +32,7 @@ fmt *ARGS:
 # Run Nightly cargo fmt, ordering imports by groups
 fmt2:
     cargo +nightly fmt -- --config imports_granularity=Module,group_imports=StdExternalCrate
+    cd c && cargo +nightly fmt -- --config imports_granularity=Module,group_imports=StdExternalCrate
 
 # Run cargo clippy
 clippy:

src/bin/brotli.rs

@@ -1,27 +1,27 @@
 #![cfg_attr(feature = "benchmark", feature(test))]
 
+extern crate alloc_no_stdlib;
+extern crate brotli;
+extern crate brotli_decompressor;
+extern crate core;
+#[cfg(feature = "validation")]
+extern crate sha2;
+
 pub mod integration_tests;
 mod test_broccoli;
 mod test_custom_dict;
 mod test_threading;
 mod tests;
 mod util;
+mod validate;
 
-extern crate brotli;
-extern crate brotli_decompressor;
-extern crate core;
-#[cfg(feature = "validation")]
-extern crate sha2;
-#[allow(unused_imports)]
-#[macro_use]
-extern crate alloc_no_stdlib;
 use core::cmp::{max, min};
 use core::ops;
+use std::env;
+use std::fs::File;
+use std::io::{self, Error, ErrorKind, Read, Seek, SeekFrom, Write};
 
-#[allow(unused_imports)]
-use alloc_no_stdlib::{
-    bzero, AllocatedStackMemory, Allocator, SliceWrapper, SliceWrapperMut, StackAllocator,
-};
+use alloc_no_stdlib::{Allocator, SliceWrapper, SliceWrapperMut};
 use brotli::enc::backward_references::BrotliEncoderMode;
 use brotli::enc::threading::{
     BrotliEncoderThreadError, CompressMulti, CompressionThreadResult, Owned, SendAlloc,
@@ -31,12 +31,6 @@ use brotli::enc::{
     UnionHasher, WorkerPool,
 };
 use brotli::CustomRead;
-#[allow(unused_imports)]
-use brotli::HuffmanCode;
-mod validate;
-use std::env;
-use std::fs::File;
-use std::io::{self, Error, ErrorKind, Read, Seek, SeekFrom, Write};
 
 const MAX_THREADS: usize = 16;
 

src/bin/integration_tests.rs

@@ -1,8 +1,10 @@
 #![cfg(test)]
 #![allow(non_upper_case_globals)]
 #![allow(dead_code)]
+
 extern crate brotli_decompressor;
 extern crate core;
+
 use core::cmp::min;
 use std::io;
 #[cfg(feature = "std")]
@@ -13,7 +15,6 @@ use std::time::SystemTime;
 
 use brotli::BrotliDecompressStream;
 
-#[allow(unused_imports)]
 use super::alloc_no_stdlib::{Allocator, SliceWrapper, SliceWrapperMut};
 use super::brotli::{BrotliResult, BrotliState};
 #[cfg(feature = "std")]

src/bin/test_broccoli.rs

@@ -1,15 +1,19 @@
 #![cfg(test)]
 #![allow(non_upper_case_globals)]
 #![allow(dead_code)]
+
 extern crate brotli_decompressor;
 extern crate core;
+
 use core::cmp::{max, min};
 
 use brotli_decompressor::{CustomRead, CustomWrite};
 
 use super::brotli::concat::{BroCatli, BroCatliResult};
 use super::brotli::enc::BrotliEncoderParams;
 use super::integration_tests::UnlimitedBuffer;
+use super::Rebox;
+
 static RANDOM_THEN_UNICODE: &[u8] = include_bytes!("../../testdata/random_then_unicode");
 static ALICE: &[u8] = include_bytes!("../../testdata/alice29.txt");
 static UKKONOOA: &[u8] = include_bytes!("../../testdata/ukkonooa");
@@ -20,7 +24,7 @@ static RANDOM10K: &[u8] = include_bytes!("../../testdata/random_org_10k.bin");
 static RANDOMTHENUNICODE: &[u8] = include_bytes!("../../testdata/random_then_unicode");
 static QUICKFOX: &[u8] = include_bytes!("../../testdata/quickfox_repeated");
 static EMPTY: &[u8] = &[];
-use super::Rebox;
+
 fn concat(
     files: &mut [UnlimitedBuffer],
     brotli_files: &mut [UnlimitedBuffer],

src/bin/test_custom_dict.rs

@@ -1,16 +1,19 @@
 #![cfg(test)]
 #![allow(non_upper_case_globals)]
 #![allow(dead_code)]
+
 extern crate brotli_decompressor;
 extern crate core;
+
 use std::io::{Read, Write};
 
 use super::brotli::concat::{BroCatli, BroCatliResult};
 use super::brotli::enc::BrotliEncoderParams;
 use super::integration_tests::UnlimitedBuffer;
+use super::Rebox;
+
 static RANDOM_THEN_UNICODE: &[u8] = include_bytes!("../../testdata/random_then_unicode");
 static ALICE: &[u8] = include_bytes!("../../testdata/alice29.txt");
-use super::Rebox;
 
 #[test]
 fn test_custom_dict() {

src/bin/test_threading.rs

@@ -1,8 +1,10 @@
 #![cfg(test)]
 #![allow(non_upper_case_globals)]
 #![allow(dead_code)]
+
 extern crate brotli_decompressor;
 extern crate core;
+
 use brotli::enc::threading::{Owned, SendAlloc};
 use brotli_decompressor::{SliceWrapper, SliceWrapperMut};
 
@@ -11,10 +13,10 @@ use super::brotli::enc::{
     BrotliEncoderParams, UnionHasher,
 };
 use super::integration_tests::UnlimitedBuffer;
-use super::new_brotli_heap_alloc;
+use super::{new_brotli_heap_alloc, Rebox};
+
 static RANDOM_THEN_UNICODE: &[u8] = include_bytes!("../../testdata/random_then_unicode");
 static ALICE: &[u8] = include_bytes!("../../testdata/alice29.txt");
-use super::Rebox;
 
 struct SliceRef<'a>(&'a [u8]);
 impl<'a> SliceWrapper<u8> for SliceRef<'a> {

src/bin/tests.rs

@@ -1,12 +1,15 @@
 #![cfg(test)]
+
 extern crate core;
+
 use core::cmp::min;
 use std::io;
 
 struct Buffer {
     data: Vec<u8>,
     read_offset: usize,
 }
+
 impl Buffer {
     pub fn new(buf: &[u8]) -> Buffer {
         let mut ret = Buffer {

src/bin/util.rs

@@ -1,5 +1,6 @@
 use core::marker::PhantomData;
 use core::mem;
+use std;
 use std::collections::BTreeMap;
 use std::fmt;
 use std::thread::JoinHandle;

src/enc/backward_references/benchmark.rs

@@ -1,9 +1,12 @@
 #![cfg(feature = "benchmark")]
 #![cfg(feature = "std")]
+
 extern crate test;
+
 use alloc_stdlib::StandardAlloc;
 
 use super::*;
+
 static RANDOM_THEN_UNICODE: &'static [u8] = include_bytes!("../../../testdata/random_then_unicode");
 static FINALIZE_DATA: &'static [u8] = &[
     0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
@@ -13,6 +16,7 @@ static FINALIZE_DATA: &'static [u8] = &[
 ];
 const TEST_LEN: usize = 256 * 1024;
 const DISTANCE_CACHE: &'static [i32] = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]; // distance cache
+
 fn make_generic_hasher() -> AdvHasher<H5Sub, StandardAlloc> {
     let params_hasher = BrotliHasherParams {
         type_: 5,