fixup

Author: daniel.eades

Cargo.lock

@@ -6,4 +6,4 @@ mod bitstore;
 pub use bitstore::BitStore;
 
 mod model;
-pub use model::{fixed_length, max_length, one_shot, Model};
+pub use model::{Model, fixed_length, max_length, one_shot};

arithmetic-coding-core/src/lib.rs

@@ -3,7 +3,7 @@
 use std::ops::Range;
 
 pub use crate::fixed_length::Wrapper;
-use crate::{fixed_length, BitStore};
+use crate::{BitStore, fixed_length};
 
 /// A [`Model`] is used to calculate the probability of a given symbol occurring
 /// in a sequence.

arithmetic-coding-core/src/model/one_shot.rs

@@ -1,7 +1,7 @@
 use std::{fs::File, io::Read, ops::Range};
 
 use arithmetic_coding::Model;
-use fenwick_model::{simple::FenwickModel, ValueError};
+use fenwick_model::{ValueError, simple::FenwickModel};
 
 mod common;
 
@@ -58,7 +58,7 @@ fn round_trip(input: &[u8]) {
     common::round_trip(model, input);
 }
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 
 #[allow(clippy::missing_panics_doc)]
 pub fn criterion_benchmark(c: &mut Criterion) {

benches/sherlock.rs

@@ -4,7 +4,7 @@ use arithmetic_coding::Model;
 
 mod common;
 
-use fenwick_model::{simple::FenwickModel, ValueError};
+use fenwick_model::{ValueError, simple::FenwickModel};
 
 const ALPHABET: &str =
     "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 .,\n-':()[]#*;\"!?*&é/àâè%@$";

examples/fenwick_adaptive.rs

@@ -4,7 +4,7 @@ use arithmetic_coding::Model;
 
 mod common;
 
-use fenwick_model::{context_switching::FenwickModel, ValueError};
+use fenwick_model::{ValueError, context_switching::FenwickModel};
 
 const ALPHABET: &str =
     "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 .,\n-':()[]#*;\"!?*&é/àâè%@$";

examples/fenwick_context_switching.rs

@@ -5,8 +5,8 @@ use std::{io, ops::Range};
 use bitstream_io::BitRead;
 
 use crate::{
-    common::{self, assert_precision_sufficient},
     BitStore, Model,
+    common::{self, assert_precision_sufficient},
 };
 
 // this algorithm is derived from this article - https://marknelson.us/posts/2014/10/19/data-compression-with-arithmetic-coding.html

src/decoder.rs

@@ -5,8 +5,8 @@ use std::{io, ops::Range};
 use bitstream_io::BitWrite;
 
 use crate::{
-    common::{self, assert_precision_sufficient},
     BitStore, Error, Model,
+    common::{self, assert_precision_sufficient},
 };
 
 // this algorithm is derived from this article - https://marknelson.us/posts/2014/10/19/data-compression-with-arithmetic-coding.html

src/encoder.rs

@@ -6,7 +6,7 @@
     missing_copy_implementations
 )]
 
-pub use arithmetic_coding_core::{fixed_length, max_length, one_shot, BitStore, Model};
+pub use arithmetic_coding_core::{BitStore, Model, fixed_length, max_length, one_shot};
 
 mod common;
 pub mod decoder;

src/lib.rs

@@ -4,7 +4,7 @@
 
 use std::{convert::Infallible, io::Cursor, ops::Range};
 
-use arithmetic_coding::{decoder, encoder, Decoder, Encoder};
+use arithmetic_coding::{Decoder, Encoder, decoder, encoder};
 use arithmetic_coding_core::one_shot;
 use bitstream_io::{BigEndian, BitReader, BitWriter};