Some small clippy cleanups.

This commit is contained in:
2020-12-22 15:23:39 -08:00
parent 0759fb837d
commit 8ff82f9806
2 changed files with 4 additions and 3 deletions

View File

@@ -73,7 +73,7 @@ fn main() -> Result<(), TopLevelError> {
for (key, mut val) in mapping.drain() { for (key, mut val) in mapping.drain() {
final_allergens.push((key, val.drain().next().unwrap())); 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 foods: Vec<&str> = final_allergens.iter().map(|(_, v)| *v).collect();
let mut result = String::new(); let mut result = String::new();

View File

@@ -124,6 +124,7 @@ impl Tile {
self.raw_data[(y * self.edge_length) + x] = v; self.raw_data[(y * self.edge_length) + x] = v;
} }
#[cfg(test)]
fn draw(&self) { fn draw(&self) {
println!("Tile {} [{:?}]:", self.identity, self.history); println!("Tile {} [{:?}]:", self.identity, self.history);
for y in 0..self.edge_length { for y in 0..self.edge_length {
@@ -463,7 +464,7 @@ impl Board {
.map(|x| x[0].identity) .map(|x| x[0].identity)
.collect(); .collect();
let orig_length = idents.len(); let orig_length = idents.len();
idents.sort(); idents.sort_unstable();
idents.dedup(); idents.dedup();
if idents.len() == orig_length { if idents.len() == orig_length {
return Ok(possible_board); return Ok(possible_board);
@@ -729,7 +730,7 @@ fn main() -> Result<(), TopLevelError> {
tl * tr * bl * br tl * tr * bl * br
); );
println!(); println!();
let mut base_image = Image::from(final_value); let base_image = Image::from(final_value);
base_image.draw(); base_image.draw();
println!("---------------------"); println!("---------------------");
let sea_monster = Image::sea_monster(); let sea_monster = Image::sea_monster();