Merge pull request #180 from nyurik/fmt-use

Auto-format `use` statements

Author: danielrh

src/bin/brotli.rs

@@ -15,6 +15,9 @@ extern crate sha2;
 #[allow(unused_imports)]
 #[macro_use]
 extern crate alloc_no_stdlib;
+use core::cmp::{max, min};
+use core::ops;
+
 #[allow(unused_imports)]
 use alloc_no_stdlib::{
     bzero, AllocatedStackMemory, Allocator, SliceWrapper, SliceWrapperMut, StackAllocator,
@@ -30,11 +33,8 @@ use brotli::enc::{
 use brotli::CustomRead;
 #[allow(unused_imports)]
 use brotli::HuffmanCode;
-use core::cmp::{max, min};
-use core::ops;
 mod validate;
 use std::env;
-
 use std::fs::File;
 use std::io::{self, Error, ErrorKind, Read, Seek, SeekFrom, Write};
 

src/bin/catbrotli.rs

@@ -1,10 +1,9 @@
 extern crate brotli;
 extern crate core;
-use std::env;
 use std::fs::File;
-use std::io;
 use std::io::{Read, Write};
 use std::path::Path;
+use std::{env, io};
 
 use brotli::concat::{BroCatli, BroCatliResult};
 fn usage() {

src/bin/integration_tests.rs

@@ -3,17 +3,6 @@
 #![allow(dead_code)]
 extern crate brotli_decompressor;
 extern crate core;
-#[allow(unused_imports)]
-use super::alloc_no_stdlib::{Allocator, SliceWrapper, SliceWrapperMut};
-use super::brotli::BrotliResult;
-use super::brotli::BrotliState;
-#[cfg(feature = "std")]
-use super::brotli::{CompressorReader, CompressorWriter};
-#[cfg(feature = "std")]
-use super::brotli_decompressor::{Decompressor, DecompressorWriter};
-use super::HeapAllocator;
-use super::Rebox;
-use brotli::BrotliDecompressStream;
 use core::cmp::min;
 use std::io;
 #[cfg(feature = "std")]
@@ -22,6 +11,17 @@ use std::time::Duration;
 #[cfg(not(feature = "disable-timer"))]
 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")]
+use super::brotli::{CompressorReader, CompressorWriter};
+#[cfg(feature = "std")]
+use super::brotli_decompressor::{Decompressor, DecompressorWriter};
+use super::{HeapAllocator, Rebox};
+
 #[cfg(feature = "benchmark")]
 extern crate test;
 #[cfg(feature = "benchmark")]

src/bin/test_broccoli.rs

@@ -3,11 +3,13 @@
 #![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 brotli_decompressor::{CustomRead, CustomWrite};
-use core::cmp::{max, min};
 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");

src/bin/test_custom_dict.rs

@@ -3,10 +3,11 @@
 #![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 std::io::{Read, Write};
 static RANDOM_THEN_UNICODE: &[u8] = include_bytes!("../../testdata/random_then_unicode");
 static ALICE: &[u8] = include_bytes!("../../testdata/alice29.txt");
 use super::Rebox;

src/bin/test_threading.rs

@@ -3,15 +3,15 @@
 #![allow(dead_code)]
 extern crate brotli_decompressor;
 extern crate core;
+use brotli::enc::threading::{Owned, SendAlloc};
+use brotli_decompressor::{SliceWrapper, SliceWrapperMut};
+
 use super::brotli::enc::{
     compress_multi, compress_multi_no_threadpool, BrotliEncoderMaxCompressedSizeMulti,
     BrotliEncoderParams, UnionHasher,
 };
-use super::new_brotli_heap_alloc;
-use brotli::enc::threading::{Owned, SendAlloc};
-use brotli_decompressor::{SliceWrapper, SliceWrapperMut};
-
 use super::integration_tests::UnlimitedBuffer;
+use super::new_brotli_heap_alloc;
 static RANDOM_THEN_UNICODE: &[u8] = include_bytes!("../../testdata/random_then_unicode");
 static ALICE: &[u8] = include_bytes!("../../testdata/alice29.txt");
 use super::Rebox;

src/bin/util.rs

@@ -1,5 +1,7 @@
 use core::marker::PhantomData;
 use core::mem;
+use std::collections::BTreeMap;
+use std::fmt;
 use std::thread::JoinHandle;
 
 use alloc_no_stdlib::{Allocator, SliceWrapper};
@@ -13,8 +15,6 @@ use brotli::enc::threading::{
 use brotli::enc::BrotliAlloc;
 use brotli::interface;
 use brotli::transform::TransformDictionaryWord;
-use std::collections::BTreeMap;
-use std::fmt;
 
 struct HexSlice<'a>(&'a [u8]);
 

src/bin/validate.rs

@@ -1,12 +1,14 @@
-use super::{HeapAllocator, IoWriterWrapper, Rebox};
+#[cfg(feature = "validation")]
+use core;
+use std::io::{self, Error, ErrorKind, Read, Write};
+
 use alloc_no_stdlib::{Allocator, SliceWrapper};
 use brotli::enc::BrotliEncoderParams;
 use brotli::{CustomWrite, DecompressorWriterCustomIo};
 #[cfg(feature = "validation")]
-use core;
-#[cfg(feature = "validation")]
 use sha2::{Digest, Sha256};
-use std::io::{self, Error, ErrorKind, Read, Write};
+
+use super::{HeapAllocator, IoWriterWrapper, Rebox};
 #[cfg(feature = "validation")]
 type Checksum = Sha256;
 

src/enc/backward_references/benchmark.rs

@@ -1,8 +1,9 @@
 #![cfg(feature = "benchmark")]
 #![cfg(feature = "std")]
 extern crate test;
-use super::*;
 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,

src/enc/backward_references/hash_to_binary_tree.rs

@@ -1,13 +1,7 @@
 #![allow(dead_code, unused_imports)]
-use super::{
-    kDistanceCacheIndex, kDistanceCacheOffset, kHashMul32, kHashMul64, kHashMul64Long,
-    kInvalidMatch, AnyHasher, BrotliEncoderParams, BrotliHasherParams, CloneWithAlloc, H9Opts,
-    HasherSearchResult, HowPrepared, Struct1,
-};
-use alloc;
 use alloc::{Allocator, SliceWrapper, SliceWrapperMut};
-use core;
 use core::cmp::{max, min};
+
 use enc::command::{
     CombineLengthCodes, Command, ComputeDistanceCode, GetCopyLengthCode, GetInsertLengthCode,
     PrefixEncodeCopyDistance,
@@ -17,11 +11,16 @@ use enc::dictionary_hash::kStaticDictionaryHash;
 use enc::literal_cost::BrotliEstimateBitCostsForLiterals;
 use enc::static_dict::{
     kBrotliEncDictionary, BrotliDictionary, BrotliFindAllStaticDictionaryMatches,
-};
-use enc::static_dict::{
     FindMatchLengthWithLimit, BROTLI_UNALIGNED_LOAD32, BROTLI_UNALIGNED_LOAD64,
 };
 use enc::util::{floatX, FastLog2, Log2FloorNonZero};
+use {alloc, core};
+
+use super::{
+    kDistanceCacheIndex, kDistanceCacheOffset, kHashMul32, kHashMul64, kHashMul64Long,
+    kInvalidMatch, AnyHasher, BrotliEncoderParams, BrotliHasherParams, CloneWithAlloc, H9Opts,
+    HasherSearchResult, HowPrepared, Struct1,
+};
 
 pub const kInfinity: floatX = 1.7e38 as floatX;
 #[derive(Clone, Copy, Debug)]