Twelve days of christmas improved

twelve_days_of_christmas/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "twelve_days_of_christmas"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Timothy Warren <twarren@nabancard.com>"]
 edition = "2018"
 

twelve_days_of_christmas/src/main.rs

@@ -1,16 +1,6 @@
 const ORDINALS: [&str; 12] = [
-    "first",
-    "second",
-    "third",
-    "fourth",
-    "fifth",
-    "sixth",
-    "seventh",
-    "eighth",
-    "ninth",
-    "tenth",
-    "eleventh",
-    "twelfth",
+    "first", "second", "third", "fourth", "fifth", "sixth",
+    "seventh", "eighth", "ninth", "tenth", "eleventh", "twelfth",
 ];
 
 const GIFTS: [&str; 12] = [
@@ -28,14 +18,9 @@ const GIFTS: [&str; 12] = [
     "and a partridge in a pear tree.",
 ];
 
-fn format_verse(day: &str, gifts: &str) -> String {
-    format!("On the {} day of Christmas, my true love gave to me: \n{}\n", day, gifts)
-}
-
-fn main() {
-    for n in 0..12 {
-        let verse: String = match n {
-            0 => format_verse("first", "A partridge in a pear tree."),
+fn get_gifts(n: usize) -> String {
+    match n {
+        0 => String::from("A partridge in a pear tree."),
         _ => {
             // The highest index is 11, and we want
             // the highest index to start, so we can
@@ -44,15 +29,19 @@ fn main() {
 
             // Get the slice of the array of gifts, from
             // the index to the end of the array
-                let gifts = &GIFTS[gift_index..]
+            GIFTS[gift_index..]
                 .to_vec() // So we have the join method that returns a string
-                    .join(",\n");
+                .join(",\n")
+        }
+    }
+}
 
-                format_verse(ORDINALS[n], gifts)
-            }
-        };
-
-        // For some reason, the println! macro only takes string literals
-        println!("{}", verse);
+fn main() {
+    for n in 0..12 {
+        println!(
+            "On the {} day of Christmas, my true love gave to me: \n{}\n",
+            ORDINALS[n],
+            get_gifts(n)
+        );
     }
 }