Made the '-a' flag accept language names with special characters

shuni64 · Nov 4, 2019 · 13928fa · 13928fa
1 parent 46e70b3
commit 13928fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/language.rs b/src/language.rs
@@ -11,7 +11,9 @@ pub enum Language {
     C,
     Clojure,
     CoffeeScript,
+    #[strum(serialize = "c++")]
     Cpp,
+    #[strum(serialize = "c#")]
     Csharp,
     CSS,
     Dart,
@@ -31,6 +33,7 @@ pub enum Language {
     Lisp,
     Lua,
     Nim,
+    #[strum(serialize = "objective-c")]
     ObjectiveC,
     Perl,
     Php,
@@ -60,8 +63,8 @@ impl std::fmt::Display for Language {
             Language::C => write!(f, "C"),
             Language::Clojure => write!(f, "Clojure"),
             Language::CoffeeScript => write!(f, "CoffeeScript"),
-            Language::Cpp => write!(f, "Cpp"),
-            Language::Csharp => write!(f, "Csharp"),
+            Language::Cpp => write!(f, "C++"),
+            Language::Csharp => write!(f, "C#"),
             Language::CSS => write!(f, "CSS"),
             Language::Dart => write!(f, "Dart"),
             Language::Elixir => write!(f, "Elixir"),
@@ -80,7 +83,7 @@ impl std::fmt::Display for Language {
             Language::Lisp => write!(f, "Lisp"),
             Language::Lua => write!(f, "Lua"),
             Language::Nim => write!(f, "Nim"),
-            Language::ObjectiveC => write!(f, "ObjectiveC"),
+            Language::ObjectiveC => write!(f, "Objective-C"),
             Language::PureScript => write!(f, "PureScript"),
             Language::Python => write!(f, "Python"),
             Language::R => write!(f, "R"),

diff --git a/src/main.rs b/src/main.rs
@@ -114,13 +114,14 @@ fn main() -> Result<()> {
                 .short("a")
                 .long("ascii_language")
                 .takes_value(true)
-                .default_value("")
+                .default_value("rust")
                 .possible_values(
                     &possible_languages
                         .iter()
                         .map(|l| l.as_str())
                         .collect::<Vec<&str>>(),
                 )
+                .case_insensitive(true)
                 .help("Overrides showing the dominant language ascii logo."),
         )
         .arg(