diff --git a/Cargo.lock b/Cargo.lock index 3d0feec..e83c00c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,7 +29,7 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "livestock-rs" -version = "0.9.0" +version = "0.9.1" dependencies = [ "Inflector", "serde", diff --git a/Cargo.toml b/Cargo.toml index 2e34b2e..d05d5b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "livestock-rs" -version = "0.9.0" +version = "0.9.1" edition = "2021" authors = ["Jaken Herman "] license = "MIT" diff --git a/README.md b/README.md index 29701f9..b8549b3 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Add the crate to your `Cargo.toml`: ``` [dependencies] -livestock_rs = "0.9.0" +livestock_rs = "0.9.1" ``` or diff --git a/src/camel.rs b/src/camel.rs index 778a70e..ba053ea 100644 --- a/src/camel.rs +++ b/src/camel.rs @@ -1,3 +1,4 @@ +use inflector::Inflector; use serde::{Deserialize, Serialize}; use std::str::FromStr; @@ -32,13 +33,7 @@ impl ToString for CamelBreed { /// println!("{}", alxa.to_string()); /// ``` fn to_string(&self) -> String { - match self { - CamelBreed::AfarDromedary => "Afar Dromedary".to_string(), - CamelBreed::AlxaBactrian => "Alxa Bactrian".to_string(), - CamelBreed::ArvanaDromedary => "Arvana Dromedary".to_string(), - CamelBreed::KalmykBactrian => "Kalmyk Bactrian".to_string(), - CamelBreed::SomaliDromedary => "Somali Dromedary".to_string(), - } + format!("{:?}", self).to_title_case() } } diff --git a/src/chicken.rs b/src/chicken.rs index 22e9e3c..d35dfc2 100644 --- a/src/chicken.rs +++ b/src/chicken.rs @@ -1,3 +1,4 @@ +use inflector::Inflector; use serde::{Deserialize, Serialize}; use std::str::FromStr; @@ -98,79 +99,7 @@ impl ToString for ChickenBreed { /// println!("{}", orp.to_string()); /// ``` fn to_string(&self) -> String { - match self { - ChickenBreed::AC => "AC".to_string(), - ChickenBreed::Ameraucana => "Ameraucana".to_string(), - ChickenBreed::Ancona => "Ancona".to_string(), - ChickenBreed::Andalusian => "Andalusian".to_string(), - ChickenBreed::AppenzellBeardedHen => "Appenzell Bearded Hen".to_string(), - ChickenBreed::AppenzellPointedHoodHen => "Appenzell Pointed Hood Hen".to_string(), - ChickenBreed::Araucana => "Araucana".to_string(), - ChickenBreed::Aseel => "Aseel".to_string(), - ChickenBreed::Australorp => "Australorp".to_string(), - ChickenBreed::Baheij => "Baheij".to_string(), - ChickenBreed::Bandara => "Bandara".to_string(), - ChickenBreed::Barnevelders => "Barnevelders".to_string(), - ChickenBreed::Brahma => "Brahma".to_string(), - ChickenBreed::Buckeye => "Buckeye".to_string(), - ChickenBreed::Buttercup => "Buttercup".to_string(), - ChickenBreed::Campine => "Campine".to_string(), - ChickenBreed::Catalana => "Catalana".to_string(), - ChickenBreed::Chantecler => "Chantecler".to_string(), - ChickenBreed::Cochin => "Cochin".to_string(), - ChickenBreed::Cornish => "Cornish".to_string(), - ChickenBreed::Crevecoeur => "Crevecoeur".to_string(), - ChickenBreed::Cubalaya => "Cubalaya".to_string(), - ChickenBreed::Delaware => "Delaware".to_string(), - ChickenBreed::Dominiques => "Dominiques".to_string(), - ChickenBreed::Dorking => "Dorking".to_string(), - ChickenBreed::DutchBantam => "Dutch Bantam".to_string(), - ChickenBreed::Faverolles => "Faverolles".to_string(), - ChickenBreed::Friesian => "Friesian".to_string(), - ChickenBreed::Frizzle => "Frizzle".to_string(), - ChickenBreed::Gimmizah => "Gimmizah".to_string(), - ChickenBreed::GoldenMontazah => "Golden Montazah".to_string(), - ChickenBreed::Hamburg => "Hamburg".to_string(), - ChickenBreed::Holland => "Holland".to_string(), - ChickenBreed::Houdan => "Houdan".to_string(), - ChickenBreed::Java => "Java".to_string(), - ChickenBreed::JerseyGiant => "Jersey Giant".to_string(), - ChickenBreed::LaFleche => "La Fleche".to_string(), - ChickenBreed::Lakenvelder => "Lakenvelder".to_string(), - ChickenBreed::Lamona => "Lamona".to_string(), - ChickenBreed::Langshan => "Langshan".to_string(), - ChickenBreed::Legbar => "Legbar".to_string(), - ChickenBreed::Leghorn => "Leghorn".to_string(), - ChickenBreed::Marans => "Marans".to_string(), - ChickenBreed::Malay => "Malay".to_string(), - ChickenBreed::Matrouh => "Matrouh".to_string(), - ChickenBreed::Minorca => "Minorca".to_string(), - ChickenBreed::ModernGame => "Modern Game".to_string(), - ChickenBreed::NakedNeck => "Naked Neck".to_string(), - ChickenBreed::Nankin => "Nankin".to_string(), - ChickenBreed::NewHampshireRed => "New Hampshire Red".to_string(), - ChickenBreed::OldEnglishGame => "Old English Game".to_string(), - ChickenBreed::Orpington => "Orpington".to_string(), - ChickenBreed::PlymouthRock => "Plymouth Rock".to_string(), - ChickenBreed::Polish => "Polish".to_string(), - ChickenBreed::RedCap => "Red Cap".to_string(), - ChickenBreed::RhodeIslandRed => "Rhode Island Red".to_string(), - ChickenBreed::RussianOrloff => "Russian Orloff".to_string(), - ChickenBreed::Sasso => "Sasso".to_string(), - ChickenBreed::Sebright => "Sebright".to_string(), - ChickenBreed::Shamo => "Shamo".to_string(), - ChickenBreed::SilkieBantam => "Silkie Bantam".to_string(), - ChickenBreed::SilverMontazah => "Silver Montazah".to_string(), - ChickenBreed::Styrian => "Styrian".to_string(), - ChickenBreed::Sultan => "Sultan".to_string(), - ChickenBreed::Sumatra => "Sumatra".to_string(), - ChickenBreed::Sussex => "Sussex".to_string(), - ChickenBreed::SwissHen => "Swiss Hen".to_string(), - ChickenBreed::Welsummer => "Welsummer".to_string(), - ChickenBreed::WhiteFacedBlackSpanish => "White Faced Black Spanish".to_string(), - ChickenBreed::Wyandotte => "Wyandotte".to_string(), - ChickenBreed::Yokohama => "Yokohama".to_string(), - } + format!("{:?}", self).to_title_case() } } @@ -273,7 +202,7 @@ mod tests { fn test_to_string() { // we don't have any special cases, just test a few random ones let breeds = [ - (ChickenBreed::AC, "AC"), + (ChickenBreed::AC, "Ac"), (ChickenBreed::Ameraucana, "Ameraucana"), (ChickenBreed::Ancona, "Ancona"), (ChickenBreed::Andalusian, "Andalusian"), diff --git a/src/donkey.rs b/src/donkey.rs index 685addf..3b0b425 100644 --- a/src/donkey.rs +++ b/src/donkey.rs @@ -1,3 +1,4 @@ +use inflector::Inflector; use serde::{Deserialize, Serialize}; use std::str::FromStr; @@ -35,16 +36,7 @@ impl ToString for DonkeyBreed { /// println!("{}", evenk.to_string()); /// ``` fn to_string(&self) -> String { - match self { - DonkeyBreed::Abyssinian => "Abyssinian".to_string(), - DonkeyBreed::Anatolia => "Anatolia".to_string(), - DonkeyBreed::LargeStandard => "Large Standard".to_string(), - DonkeyBreed::MammothJackStock => "Mammoth Jack Stock".to_string(), - DonkeyBreed::Mary => "Mary".to_string(), - DonkeyBreed::Miniature => "Miniature".to_string(), - DonkeyBreed::Poitou => "Poitou".to_string(), - DonkeyBreed::Standard => "Standard".to_string(), - } + format!("{:?}", self).to_title_case() } }