diff --git a/src/bin/allergens.rs b/src/bin/allergens.rs index ae0c3b3..5cae4e3 100644 --- a/src/bin/allergens.rs +++ b/src/bin/allergens.rs @@ -73,7 +73,7 @@ fn main() -> Result<(), TopLevelError> { for (key, mut val) in mapping.drain() { final_allergens.push((key, val.drain().next().unwrap())); } - final_allergens.sort_by(|(k1, v1), (k2, v2)| k1.cmp(k2)); + final_allergens.sort_by(|(k1, _), (k2, _)| k1.cmp(k2)); let foods: Vec<&str> = final_allergens.iter().map(|(_, v)| *v).collect(); let mut result = String::new(); diff --git a/src/bin/satellite.rs b/src/bin/satellite.rs index 4566738..a1b85dd 100644 --- a/src/bin/satellite.rs +++ b/src/bin/satellite.rs @@ -124,6 +124,7 @@ impl Tile { self.raw_data[(y * self.edge_length) + x] = v; } + #[cfg(test)] fn draw(&self) { println!("Tile {} [{:?}]:", self.identity, self.history); for y in 0..self.edge_length { @@ -463,7 +464,7 @@ impl Board { .map(|x| x[0].identity) .collect(); let orig_length = idents.len(); - idents.sort(); + idents.sort_unstable(); idents.dedup(); if idents.len() == orig_length { return Ok(possible_board); @@ -729,7 +730,7 @@ fn main() -> Result<(), TopLevelError> { tl * tr * bl * br ); println!(); - let mut base_image = Image::from(final_value); + let base_image = Image::from(final_value); base_image.draw(); println!("---------------------"); let sea_monster = Image::sea_monster();