From 82b522fcebfbcb6e464d7b87cb017b110368b70c Mon Sep 17 00:00:00 2001
From: Matthew Hall <hallmatthew314@gmail.com>
Date: Thu, 4 Apr 2024 00:48:53 +1300
Subject: Minor refactors

---
 src/main.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/main.rs b/src/main.rs
index 2d7c335..74cb73d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -168,7 +168,7 @@ impl CategorySet {
             ds.choose(&mut thread_rng())
                 .expect("got a OneOf that is empty, somehow")
         } else {
-            &drop_in
+            drop_in
         };
 
         let category = match simple_di {
@@ -179,7 +179,7 @@ impl CategorySet {
                 OsString::from(s)
             },
             DropIn::Var(s) => {
-                self.resolve_variable(&s)?
+                self.resolve_variable(s)?
             },
             DropIn::OneOf(_) => {
                 panic!("Nested OneOf constructs are not supported")
@@ -234,15 +234,14 @@ impl Sentence {
 
     pub fn generate(&self, categories: &mut CategorySet) -> ProgResult<String> {
         let mut text_iter = self.text_fragments.iter();
-        let mut drop_ins_iter = self.drop_ins.iter();
         let mut buffer = String::new();
 
-        while let Some(drop_in) = drop_ins_iter.next() {
+        for drop_in in self.drop_ins.iter() {
             let text = text_iter.next()
                 .expect("invariant: number of text = number of drop-in + 1");
             buffer.push_str(text);
 
-            let drop_in_text = categories.random_from_drop_in(&drop_in)?;
+            let drop_in_text = categories.random_from_drop_in(drop_in)?;
             buffer.push_str(drop_in_text.as_str());
         }
 
@@ -340,7 +339,7 @@ fn crash(e: Error) -> ! {
     process::exit(1);
 }
 
-fn sub_main() -> ProgResult<()> {
+fn run() -> ProgResult<()> {
     let args = Args::parse()?;
     let (mut sentences, mut categories) = read_files(&args.directory, args.unique)?;
 
@@ -354,7 +353,7 @@ fn sub_main() -> ProgResult<()> {
 }
 
 fn main() {
-    if let Err(e) = sub_main() {
+    if let Err(e) = run() {
         crash(e)
     }
 }
-- 
cgit v1.2.1