Clippy, fmt, and version bump

d702e20 · Jan 31, 2024 · ba6ef62 · ba6ef62
1 parent 8e92acf
commit ba6ef62
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 21 deletions.
diff --git a/cgaal-cli/Cargo.toml b/cgaal-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cgaal"
-version = "2.0.2"
+version = "2.0.3"
 authors = [
     "Asger Weirsøe <[email protected]>",
     "Falke Carlsen <[email protected]>",
@@ -24,4 +24,4 @@ tracing-subscriber = "0.2.17"
 serde_json = "1.0.83"
 regex = { version = "1", features = ["unicode-case"] }
 humantime = "2.1.0"
-cgaal-engine = { path = "../cgaal-engine", version = "2.0.0" }
+cgaal-engine = { path = "../cgaal-engine", version = "2.0.1" }
diff --git a/cgaal-engine/Cargo.toml b/cgaal-engine/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cgaal-engine"
-version = "2.0.0"
+version = "2.0.1"
 authors = [
     "Asger Weirsøe <[email protected]>",
     "Falke Carlsen <[email protected]>",

diff --git a/cgaal-engine/src/algorithms/certain_zero/search_strategy/composite.rs b/cgaal-engine/src/algorithms/certain_zero/search_strategy/composite.rs
@@ -93,7 +93,7 @@ impl CompositeSearchStrategyBuilder {
         strategies: Vec<CompositeSearchStrategyOption>,
     ) -> CompositeSearchStrategyBuilder {
         assert!(
-            strategies.len() > 0,
+            !strategies.is_empty(),
             "Composite search strategy must have at least one component search strategy"
         );
         CompositeSearchStrategyBuilder {
@@ -131,13 +131,16 @@ impl SearchStrategyBuilder<AtlVertex, CompositeSearchStrategyInstance>
         };
         let mut i = self.index.borrow_mut();
         *i = (*i + 1) % self.strategies.len();
-        return ss;
+        ss
     }
 }
 
 #[cfg(test)]
 mod test {
-    use crate::algorithms::certain_zero::search_strategy::composite::{CompositeSearchStrategyBuilder, CompositeSearchStrategyInstance, CompositeSearchStrategyOption};
+    use crate::algorithms::certain_zero::search_strategy::composite::{
+        CompositeSearchStrategyBuilder, CompositeSearchStrategyInstance,
+        CompositeSearchStrategyOption,
+    };
     use crate::algorithms::certain_zero::search_strategy::SearchStrategyBuilder;
     use crate::atl::Phi;
     use crate::edg::atledg::vertex::AtlVertex;
@@ -152,22 +155,55 @@ mod test {
         let errors = ErrorLog::new();
         let lcgs = IntermediateLcgs::create(LcgsRoot::new(Span::empty(), vec![]), &errors).unwrap();
 
-        let builder = CompositeSearchStrategyBuilder::new(lcgs, vec![
-            CompositeSearchStrategyOption::Bfs,
-            CompositeSearchStrategyOption::Dfs,
-            CompositeSearchStrategyOption::Dhs,
-        ]);
+        let builder = CompositeSearchStrategyBuilder::new(
+            lcgs,
+            vec![
+                CompositeSearchStrategyOption::Bfs,
+                CompositeSearchStrategyOption::Dfs,
+                CompositeSearchStrategyOption::Dhs,
+            ],
+        );
 
-        let root = AtlVertex::Full { state: StateIdx(0), formula: Phi::True.into() };
+        let root = AtlVertex::Full {
+            state: StateIdx(0),
+            formula: Phi::True.into(),
+        };
 
-        assert!(matches!(builder.build(&root), CompositeSearchStrategyInstance::Bfs(_)));
-        assert!(matches!(builder.build(&root), CompositeSearchStrategyInstance::Dfs(_)));
-        assert!(matches!(builder.build(&root), CompositeSearchStrategyInstance::Dhs(_)));
-        assert!(matches!(builder.build(&root), CompositeSearchStrategyInstance::Bfs(_)));
-        assert!(matches!(builder.build(&root), CompositeSearchStrategyInstance::Dfs(_)));
-        assert!(matches!(builder.build(&root), CompositeSearchStrategyInstance::Dhs(_)));
-        assert!(matches!(builder.build(&root), CompositeSearchStrategyInstance::Bfs(_)));
-        assert!(matches!(builder.build(&root), CompositeSearchStrategyInstance::Dfs(_)));
-        assert!(matches!(builder.build(&root), CompositeSearchStrategyInstance::Dhs(_)));
+        assert!(matches!(
+            builder.build(&root),
+            CompositeSearchStrategyInstance::Bfs(_)
+        ));
+        assert!(matches!(
+            builder.build(&root),
+            CompositeSearchStrategyInstance::Dfs(_)
+        ));
+        assert!(matches!(
+            builder.build(&root),
+            CompositeSearchStrategyInstance::Dhs(_)
+        ));
+        assert!(matches!(
+            builder.build(&root),
+            CompositeSearchStrategyInstance::Bfs(_)
+        ));
+        assert!(matches!(
+            builder.build(&root),
+            CompositeSearchStrategyInstance::Dfs(_)
+        ));
+        assert!(matches!(
+            builder.build(&root),
+            CompositeSearchStrategyInstance::Dhs(_)
+        ));
+        assert!(matches!(
+            builder.build(&root),
+            CompositeSearchStrategyInstance::Bfs(_)
+        ));
+        assert!(matches!(
+            builder.build(&root),
+            CompositeSearchStrategyInstance::Dfs(_)
+        ));
+        assert!(matches!(
+            builder.build(&root),
+            CompositeSearchStrategyInstance::Dhs(_)
+        ));
     }
 }