use newer cargo workspace features (#49)

Author: danieleades

Cargo.toml

@@ -9,16 +9,21 @@ categories = ["compression", "encoding", "parsing"]
 repository = "https://github.com/danieleades/arithmetic-coding"
 
 [workspace]
-members = [
-    ".",
-    "arithmetic-coding-core",
-    "fenwick-model",
-]
+members = [".", "arithmetic-coding-core", "fenwick-model"]
+
+[workspace.dependencies]
+thiserror = "1.0.30"
+
+[workspace.lints.clippy]
+cargo = "deny"
+all = "deny"
+nursery = "warn"
+pedantic = "warn"
 
 [dependencies]
 arithmetic-coding-core = { path = "./arithmetic-coding-core", version = "0.3.0" }
 bitstream-io = "1.2.0"
-thiserror = "1.0.30"
+thiserror = { workspace = true }
 
 [dev-dependencies]
 fenwick-model = { path = "./fenwick-model" }
@@ -28,3 +33,6 @@ test-case = "3.0.0"
 [[bench]]
 name = "sherlock"
 harness = false
+
+[lints]
+workspace = true

arithmetic-coding-core/Cargo.toml

@@ -11,5 +11,7 @@ repository = "https://github.com/danieleades/arithmetic-coding"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-thiserror = "1.0.30"
+thiserror = { workspace = true }
 
+[lints]
+workspace = true

arithmetic-coding-core/src/lib.rs

@@ -1,12 +1,6 @@
 //! Core traits for the [`arithmetic-coding`](https://github.com/danieleades/arithmetic-coding) crate
 
-#![deny(
-    missing_docs,
-    clippy::all,
-    missing_debug_implementations,
-    clippy::cargo
-)]
-#![warn(clippy::pedantic)]
+#![deny(missing_docs, missing_debug_implementations)]
 #![feature(associated_type_defaults)]
 
 mod bitstore;

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

@@ -163,13 +163,12 @@ where
         symbol: Option<&Self::Symbol>,
     ) -> Result<Range<Self::B>, Self::ValueError> {
         if self.remaining > 0 {
-            if let Some(s) = symbol {
-                // Expected a symbol and got one. return the probability.
-                self.model.probability(s).map_err(Self::ValueError::Value)
-            } else {
+            symbol.map_or(
                 // We are expecting more symbols, but got an EOF
-                Err(Self::ValueError::UnexpectedEof)
-            }
+                Err(Self::ValueError::UnexpectedEof),
+                // Expected a symbol and got one. return the probability.
+                |s| self.model.probability(s).map_err(Self::ValueError::Value),
+            )
         } else if symbol.is_some() {
             // we should be finished, but got an extra symbol
             Err(Error::UnexpectedSymbol)

examples/sherlock.rs

@@ -28,16 +28,20 @@ impl Model for StringModel {
     type Symbol = char;
     type ValueError = Error;
 
+    #[allow(clippy::range_plus_one)]
     fn probability(&self, symbol: Option<&Self::Symbol>) -> Result<Range<usize>, Error> {
-        if let Some(char) = symbol {
-            match self.alphabet.iter().position(|x| x == char) {
-                Some(index) => Ok(index..(index + 1)),
-                None => Err(Error(*char)),
-            }
-        } else {
-            let alphabet_length = self.alphabet.len();
-            Ok(alphabet_length..(alphabet_length + 1))
-        }
+        symbol.map_or_else(
+            || {
+                let alphabet_length = self.alphabet.len();
+                Ok(alphabet_length..(alphabet_length + 1))
+            },
+            |char| {
+                self.alphabet
+                    .iter()
+                    .position(|x| x == char)
+                    .map_or(Err(Error(*char)), |index| Ok(index..(index + 1)))
+            },
+        )
     }
 
     fn symbol(&self, value: usize) -> Option<Self::Symbol> {

src/lib.rs

@@ -1,12 +1,6 @@
 //! Arithmetic coding library
 
-#![deny(
-    missing_docs,
-    clippy::all,
-    missing_debug_implementations,
-    clippy::cargo
-)]
-#![warn(clippy::pedantic)]
+#![deny(missing_docs, missing_debug_implementations)]
 
 pub use arithmetic_coding_core::{fixed_length, max_length, one_shot, BitStore, Model};
 

tests/fixed_length.rs

@@ -55,7 +55,7 @@ fn round_trip() {
 }
 
 #[test]
-#[should_panic]
+#[should_panic(expected = "UnexpectedSymbol")]
 fn round_trip_fail() {
     // this is too many symbols for this model
     let input = &[

tests/max_length.rs

@@ -52,7 +52,7 @@ impl max_length::Model for MyModel {
 
 #[test_case(&[Symbol::A, Symbol::B] ; "shorter")]
 #[test_case(&[Symbol::A, Symbol::B, Symbol::C] ; "exact")]
-#[test_case(&[Symbol::A, Symbol::B, Symbol::C, Symbol::C] => panics ; "longer")]
+#[test_case(&[Symbol::A, Symbol::B, Symbol::C, Symbol::C] => panics "UnexpectedSymbol" ; "longer")]
 fn round_trip(input: &[Symbol]) {
     common::round_trip(max_length::Wrapper::new(MyModel), input);
 }

tests/sherlock.rs

@@ -19,15 +19,18 @@ impl Model for StringModel {
     type Symbol = char;
     type ValueError = Error;
 
+    #[allow(clippy::range_plus_one)]
     fn probability(&self, symbol: Option<&Self::Symbol>) -> Result<Range<Self::B>, Error> {
-        if let Some(char) = symbol {
-            match ALPHABET.chars().position(|x| &x == char) {
-                Some(index) => Ok(index..(index + 1)),
-                None => Err(Error(*char)),
-            }
-        } else {
-            Ok(ALPHABET.len()..(ALPHABET.len() + 1))
-        }
+        symbol.map_or_else(
+            || Ok(ALPHABET.len()..(ALPHABET.len() + 1)),
+            |char| {
+                ALPHABET
+                    .chars()
+                    .position(|x| &x == char)
+                    .ok_or(Error(*char))
+                    .map(|index| index..(index + 1))
+            },
+        )
     }
 
     fn symbol(&self, value: Self::B) -> Option<Self::Symbol> {