clippy issues
This commit is contained in:
parent
5351c69993
commit
9ee73c9129
1 changed files with 16 additions and 9 deletions
|
|
@ -3,7 +3,7 @@ pub fn recite(start_bottles: u32, take_down: u32) -> String {
|
|||
|
||||
((end_bottles + 1)..=start_bottles)
|
||||
.rev()
|
||||
.map(|n| verse(n))
|
||||
.map(verse)
|
||||
.collect::<Vec<_>>()
|
||||
.join("\n\n")
|
||||
}
|
||||
|
|
@ -13,18 +13,25 @@ fn verse(n: u32) -> String {
|
|||
let next_bottle = bottle_str(n - 1).to_lowercase();
|
||||
|
||||
format!(
|
||||
"{0} hanging on the wall,\n\
|
||||
{0} hanging on the wall,\n\
|
||||
"{current_bottle} hanging on the wall,\n\
|
||||
{current_bottle} hanging on the wall,\n\
|
||||
And if one green bottle should accidentally fall,\n\
|
||||
There'll be {1} hanging on the wall.",
|
||||
current_bottle, next_bottle
|
||||
There'll be {next_bottle} hanging on the wall.",
|
||||
)
|
||||
}
|
||||
|
||||
fn bottle_str(n: u32) -> String {
|
||||
let count_str = match n {
|
||||
10 => "Ten", 9 => "Nine", 8 => "Eight", 7 => "Seven", 6 => "Six",
|
||||
5 => "Five", 4 => "Four", 3 => "Three", 2 => "Two", 1 => "One",
|
||||
10 => "Ten",
|
||||
9 => "Nine",
|
||||
8 => "Eight",
|
||||
7 => "Seven",
|
||||
6 => "Six",
|
||||
5 => "Five",
|
||||
4 => "Four",
|
||||
3 => "Three",
|
||||
2 => "Two",
|
||||
1 => "One",
|
||||
_ => "No",
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue