add Display trait to VoteErrors

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "trie_rcv"
-version = "1.2.0"
+version = "1.2.1"
 edition = "2021"
 description = "Ranked Choice Voting implementation using Tries in Rust"
 license = "Apache-2.0"
@@ -9,5 +9,5 @@ repository = "https://github.com/milselarch/trie_rcv"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-itertools = "0.12.1"
+itertools = "0.13.0"
 petgraph = "0.6.4"

src/lib.rs

@@ -36,7 +36,7 @@ impl TrieNode {
     }
 
     pub fn search_child(&self, vote_value: VoteValues) -> Option<&TrieNode> {
-        return if let Some(node_ref) = self.children.get(&vote_value) {
+        if let Some(node_ref) = self.children.get(&vote_value) {
             Some(node_ref)
         } else {
             None
@@ -100,7 +100,7 @@ fn is_graph_acyclic(graph: &DiGraph<u16, u64>) -> bool {
         // get neighbors of node where there is an
         // outgoing edge from node to neighbor
         let directed_neighbors: Vec<NodeIndex> = graph
-            .edges_directed(*node, petgraph::Direction::Outgoing)
+            .edges_directed(*node, Direction::Outgoing)
             .map(|edge| { edge.target()} )
             .collect();
 
@@ -309,9 +309,9 @@ impl RankedChoiceVoteTrie {
         );
 
         if pairs_result.1 == false {
-            return lowest_vote_candidates;
+            lowest_vote_candidates
         } else {
-            return pairs_result.0;
+            pairs_result.0
         }
     }
 

src/vote.rs

@@ -1,4 +1,5 @@
 use std::collections::HashSet;
+use std::fmt;
 
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
 pub enum SpecialVotes {
@@ -22,6 +23,19 @@ pub enum VoteErrors {
     VoteIsEmpty
 }
 
+impl fmt::Display for VoteErrors {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            VoteErrors::InvalidCastToCandidate => write!(f, "Invalid cast to candidate"),
+            VoteErrors::InvalidCastToSpecialVote => write!(f, "Invalid cast to special vote"),
+            VoteErrors::ReadOutOfBounds => write!(f, "Read out of bounds"),
+            VoteErrors::NonFinalSpecialVote => write!(f, "Non-final special vote"),
+            VoteErrors::DuplicateVotes => write!(f, "Duplicate votes"),
+            VoteErrors::VoteIsEmpty => write!(f, "Vote is empty"),
+        }
+    }
+}
+
 impl VoteValues {
     pub fn to_int(self) -> i32 {
         match self {
@@ -116,7 +130,7 @@ impl RankedVote {
     pub fn from_candidates(
         candidates: &[u16]
     ) -> Result<RankedVote, VoteErrors> {
-        return Self::from_vector(
+        Self::from_vector(
             &candidates.iter().map(|x| *x as i32).collect()
         )
     }

tests/integration_test.rs

@@ -1,4 +1,3 @@
-use itertools::all;
 use trie_rcv;
 use trie_rcv::{EliminationStrategies, RankedChoiceVoteTrie};
 use trie_rcv::vote::{SpecialVotes, RankedVote};