upgrade deps and switch to anyhow macros (#45)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gift_circle"
-version = "0.11.1"
+version = "0.11.2"
 edition = "2021"
 authors = ["Chuck King"]
 
@@ -11,7 +11,7 @@ csv = "1.3"
 counter = "0.5.7"
 rand = "0.8.5"
 serde = { version = "1", features = ["derive"] }
-clap = { version = "4.5.0", features = ["derive"] }
-anyhow = "1.0.79"
+clap = { version = "4.5.2", features = ["derive"] }
+anyhow = "1.0.81"
 
 [dev-dependencies]

src/gift_circle.rs

@@ -1,6 +1,6 @@
 use std::u16;
 
-use anyhow::{anyhow, Result};
+use anyhow::Result;
 use rand::seq::SliceRandom;
 
 use super::people::{People, PeopleCycle};
@@ -76,28 +76,23 @@ fn generate_no_group_path(from_people: &mut People) -> People {
 /// and stderr prints the number of attempts taken.
 pub fn get_gift_circle(from_people: People, use_groups: bool) -> Result<People> {
     if from_people.len() <= 2 {
-        return Err(anyhow!(
-            "You must submit at least three people in order to form a gift circle."
-        ));
+        anyhow::bail!("You must submit at least three people in order to form a gift circle.");
     }
 
     let duplicates: Vec<String> = from_people.get_duplicated_names();
     if !duplicates.is_empty() {
-        return Err(anyhow!("Found duplicate names: {:#?}", duplicates));
+        anyhow::bail!("Found duplicate names: {:#?}", duplicates);
     }
 
     if use_groups {
         if from_people.has_empty_group() {
-            return Err(anyhow!(
-                "When using groups each participant must have a group assigned!"
-            ));
+            anyhow::bail!("When using groups each participant must have a group assigned!");
         }
 
-        if !from_people.has_possible_hamiltonian_path() {
-            return Err(anyhow!(
-                "Sorry, no possible hamiltonian path with this set of groups."
-            ));
-        }
+        anyhow::ensure!(
+            from_people.has_possible_hamiltonian_path(),
+            "Sorry, no possible hamiltonian path with this set of groups."
+        );
     }
 
     const MAX_ATTEMPTS: u16 = 500;
@@ -125,10 +120,10 @@ pub fn get_gift_circle(from_people: People, use_groups: bool) -> Result<People>
     }
 
     if attempt_count == MAX_ATTEMPTS {
-        return Err(anyhow!(
+        anyhow::bail!(
             "Sorry, could not find gift circle in {} attempts",
             MAX_ATTEMPTS
-        ));
+        );
     }
 
     gift_path.assign_gift_recipients();