clippy issues

This commit is contained in:
Rorik Star Platinum 2025-12-09 15:27:19 +03:00
parent 5351c69993
commit 9ee73c9129

View file

@ -3,7 +3,7 @@ pub fn recite(start_bottles: u32, take_down: u32) -> String {
((end_bottles + 1)..=start_bottles) ((end_bottles + 1)..=start_bottles)
.rev() .rev()
.map(|n| verse(n)) .map(verse)
.collect::<Vec<_>>() .collect::<Vec<_>>()
.join("\n\n") .join("\n\n")
} }
@ -13,18 +13,25 @@ fn verse(n: u32) -> String {
let next_bottle = bottle_str(n - 1).to_lowercase(); let next_bottle = bottle_str(n - 1).to_lowercase();
format!( format!(
"{0} hanging on the wall,\n\ "{current_bottle} hanging on the wall,\n\
{0} hanging on the wall,\n\ {current_bottle} hanging on the wall,\n\
And if one green bottle should accidentally fall,\n\ And if one green bottle should accidentally fall,\n\
There'll be {1} hanging on the wall.", There'll be {next_bottle} hanging on the wall.",
current_bottle, next_bottle
) )
} }
fn bottle_str(n: u32) -> String { fn bottle_str(n: u32) -> String {
let count_str = match n { let count_str = match n {
10 => "Ten", 9 => "Nine", 8 => "Eight", 7 => "Seven", 6 => "Six", 10 => "Ten",
5 => "Five", 4 => "Four", 3 => "Three", 2 => "Two", 1 => "One", 9 => "Nine",
8 => "Eight",
7 => "Seven",
6 => "Six",
5 => "Five",
4 => "Four",
3 => "Three",
2 => "Two",
1 => "One",
_ => "No", _ => "No",
}; };