Run cargo fmtHEADtrunk

2 files changed, 19 insertions, 20 deletions

diff --git a/src/animalia.rs b/src/animalia.rs
index e1ec8eb..f765172 100644
--- a/src/animalia.rs
+++ b/src/animalia.rs
@@ -1,14 +1,14 @@
+use std::collections::HashSet;
 use std::error::Error;
 use std::io::{self, prelude::*};
-use std::collections::HashSet;
 pub fn main(args: Vec<String>) -> Result<(), Box<dyn Error>> {
 	if !args.is_empty() {
 		Err("No arguments expected to 'animalia' command")?;
 	}
 	let defs_path = "en-definitions.txt";
 	let taxa_path = "taxa.txt";
-	let taxa_file = std::fs::File::open(taxa_path)
-		.map_err(|e| format!("couldn't open {taxa_path}: {e}"))?;
+	let taxa_file =
+		std::fs::File::open(taxa_path).map_err(|e| format!("couldn't open {taxa_path}: {e}"))?;
 	let mut species: HashSet<String> = HashSet::new();
 	let mut taxa: HashSet<String> = HashSet::new();
 	for line in io::BufReader::new(taxa_file).lines() {
@@ -20,28 +20,28 @@ pub fn main(args: Vec<String>) -> Result<(), Box<dyn Error>> {
 			taxa.insert(line.into());
 		}
 	}
-	let definitions = std::fs::File::open(defs_path)
-		.map_err(|e| format!("couldn't open {defs_path}: {e}"))?;
-	let levels: HashSet<&str> = [
-		"kingdom",
-		"phylum",
-		"class",
-		"order",
-		"family",
-		"genus",
-	].into_iter().collect();
+	let definitions =
+		std::fs::File::open(defs_path).map_err(|e| format!("couldn't open {defs_path}: {e}"))?;
+	let levels: HashSet<&str> = ["kingdom", "phylum", "class", "order", "family", "genus"]
+		.into_iter()
+		.collect();
 	let mut animalia = vec![];
 	for line in io::BufReader::new(definitions).lines() {
 		let line = line.map_err(|e| format!("error reading {defs_path}: {e}"))?;
 		let line = line.trim_end_matches(['\r', '\n']);
-		let (word, rest) = line.split_once("  ").expect("bad format for definitions file");
-		let (_class, definition) = rest.split_once(' ').expect("bad format for definitions file");
-//		println!("{word} {definition}");
+		let (word, rest) = line
+			.split_once("  ")
+			.expect("bad format for definitions file");
+		let (_class, definition) = rest
+			.split_once(' ')
+			.expect("bad format for definitions file");
+		//		println!("{word} {definition}");
 		let parts: Vec<&str> = definition.split(|c: char| !c.is_alphabetic()).collect();
 		for ws in parts.windows(2) {
 			if species.contains(&format!("{} {}",ws[0],ws[1])) ||
 			// handles {{taxfmt|Felidae|family}} &c.
-				levels.contains(ws[1]) && taxa.contains(ws[0]) {
+				levels.contains(ws[1]) && taxa.contains(ws[0])
+			{
 				animalia.push(word.to_owned());
 			}
 		}
@@ -54,7 +54,6 @@ pub fn main(args: Vec<String>) -> Result<(), Box<dyn Error>> {
 		s.push_str(animal);
 		s.push('\n');
 	}
-	std::fs::write(output_path, s)
-		.map_err(|e| format!("couldn't write {output_path}: {e}"))?;
+	std::fs::write(output_path, s).map_err(|e| format!("couldn't write {output_path}: {e}"))?;
 	Ok(())
 }
diff --git a/src/main.rs b/src/main.rs
index 8ca45fb..877e5cd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,8 +3,8 @@ use std::fs::File;
 use std::io::BufWriter;
 use std::process::ExitCode;
 
-mod definitions;
 mod animalia;
+mod definitions;
 
 fn do_write<W, E: Error>(path: &str, write_func: W) -> Result<(), Box<dyn Error>>
 where