diff --git a/aoclp/src/looping.rs b/aoclp/src/looping.rs
index daccc2d..c945115 100644
--- a/aoclp/src/looping.rs
+++ b/aoclp/src/looping.rs
@@ -112,9 +112,11 @@ where
         let prefix_len = self.prefix.len();
         self.prefix.nth(n).or_else(|| {
             self.cycle_pos = min(self.cycle_pos + (n - prefix_len), self.cycle_size);
-            (self.cycle_len() != 0)
-                .then(|| self.next())
-                .unwrap_or_default()
+            if self.cycle_len() != 0 {
+                self.next()
+            } else {
+                None
+            }
         })
     }
 }
diff --git a/aoclp_solutions/src/y2017/day_09.rs b/aoclp_solutions/src/y2017/day_09.rs
index c20dece..08d6d2f 100644
--- a/aoclp_solutions/src/y2017/day_09.rs
+++ b/aoclp_solutions/src/y2017/day_09.rs
@@ -26,14 +26,14 @@ impl Group {
 
         match chars.next() {
             Some('{') => (),
-            Some(c) => panic!("invalid starting character in stream: {}", c),
+            Some(c) => panic!("invalid starting character in stream: {c}"),
             None => panic!("empty stream"),
         }
 
         let root = Self::parse(&mut chars, 0);
 
         if let Some(c) = chars.next() {
-            panic!("invalid character after outermost group in stream: {}", c);
+            panic!("invalid character after outermost group in stream: {c}");
         }
 
         root
@@ -67,7 +67,7 @@ impl Group {
                 '{' => group.children.push(Self::parse(chars, group.score())),
                 '}' => return group,
                 ',' => (),
-                _ => panic!("invalid non-garbage character found in stream: {}", c),
+                _ => panic!("invalid non-garbage character found in stream: {c}"),
             }
         }
 
diff --git a/aoclp_solutions/src/y2017/day_14.rs b/aoclp_solutions/src/y2017/day_14.rs
index 5cca0ab..e73a70f 100644
--- a/aoclp_solutions/src/y2017/day_14.rs
+++ b/aoclp_solutions/src/y2017/day_14.rs
@@ -24,7 +24,7 @@ impl Disk {
         let input = input();
         Self {
             hashes: (0..128)
-                .map(|row| KnotHash::new(format!("{}-{}", input, row)))
+                .map(|row| KnotHash::new(format!("{input}-{row}")))
                 .collect(),
         }
     }