tidy and update (#39)

Author: danieleades

.clippy.toml

@@ -29,32 +29,20 @@ pub trait BitStore:
     fn log2(self) -> u32;
 }
 
-impl BitStore for u32 {
-    const BITS: u32 = u32::BITS;
-    const ONE: Self = 1;
-    const ZERO: Self = 0;
-
-    fn log2(self) -> u32 {
-        u32::ilog2(self)
-    }
-}
-
-impl BitStore for u64 {
-    const BITS: u32 = u64::BITS as u32;
-    const ONE: Self = 1;
-    const ZERO: Self = 0;
-
-    fn log2(self) -> u32 {
-        u64::ilog2(self)
-    }
+macro_rules! impl_bitstore {
+    ($t:ty) => {
+        impl BitStore for $t {
+            const BITS: u32 = Self::BITS;
+            const ONE: Self = 1;
+            const ZERO: Self = 0;
+
+            fn log2(self) -> u32 {
+                Self::ilog2(self)
+            }
+        }
+    };
 }
 
-impl BitStore for u128 {
-    const BITS: u32 = u128::BITS as u32;
-    const ONE: Self = 1;
-    const ZERO: Self = 0;
-
-    fn log2(self) -> u32 {
-        u128::ilog2(self)
-    }
-}
+impl_bitstore! {u32}
+impl_bitstore! {u64}
+impl_bitstore! {u128}

arithmetic-coding-core/src/bitstore.rs

@@ -7,7 +7,6 @@
     clippy::cargo
 )]
 #![warn(clippy::pedantic)]
-#![feature(int_log)]
 #![feature(associated_type_defaults)]
 
 mod bitstore;

arithmetic-coding-core/src/lib.rs

@@ -16,7 +16,7 @@ where
 
     println!("\ndecoding...");
     for symbol in decode(model, &buffer) {
-        println!("{:?}", symbol);
+        println!("{symbol:?}");
     }
 }
 
@@ -54,8 +54,8 @@ where
 
     let output_bytes = buffer.len();
 
-    println!("input bytes: {}", input_bytes);
-    println!("output bytes: {}", output_bytes);
+    println!("input bytes: {input_bytes}");
+    println!("output bytes: {output_bytes}");
 
     println!(
         "compression ratio: {}",
@@ -67,5 +67,5 @@ where
     let mut prefix: String = output.into_iter().take(299).collect();
     prefix.push_str("...");
 
-    println!("{}", prefix);
+    println!("{prefix}");
 }

examples/common/mod.rs

@@ -91,10 +91,10 @@ fn main() {
     use symbolic::Symbol;
 
     let input1 = [Symbol::A, Symbol::B, Symbol::C];
-    println!("input1: {:?}", input1);
+    println!("input1: {input1:?}");
 
     let input2 = [2, 1, 1, 2, 2];
-    println!("input2: {:?}", input2);
+    println!("input2: {input2:?}");
 
     println!("\nencoding...");
 
@@ -106,10 +106,10 @@ fn main() {
     let (output1, output2) = decode2(symbolic::Model, integer::Model, &buffer);
 
     for symbol in output1 {
-        println!("{:?}", symbol);
+        println!("{symbol:?}");
     }
     for symbol in output2 {
-        println!("{:?}", symbol);
+        println!("{symbol:?}");
     }
 }
 

examples/concatenated.rs

@@ -60,8 +60,8 @@ fn main() {
 
     let output_bytes = buffer.len();
 
-    println!("input bytes: {}", input_bytes);
-    println!("output bytes: {}", output_bytes);
+    println!("input bytes: {input_bytes}");
+    println!("output bytes: {output_bytes}");
 
     println!(
         "compression ratio: {}",
@@ -75,5 +75,5 @@ fn main() {
     let mut prefix: String = output.into_iter().take(299).collect();
     prefix.push_str("...");
 
-    println!("{}", prefix);
+    println!("{prefix}");
 }