Merge branch 'master' into dependabot/cargo/colored-2.0.0

Author: spenserblack

Cargo.lock

@@ -20,13 +20,12 @@ priority = "optional"
 
 [dependencies]
 colored= "2.0.0"
-git2 = {version = "0.13.6", default-features = false}
+git2 = {version = "0.13.10", default-features = false}
 tokei = "12.0.0"
 askalono = "0.4.2"
 bytecount = "0.6.0"
 clap = "2.33.3"
-strum = "0.18.0"
-strum_macros = "0.18.0"
+strum = { version = "0.19.2", features = ["derive"] }
 image = "0.23.5"
 regex = "1"
 futures = "0.3.5"

Cargo.toml

@@ -3,6 +3,7 @@ use {
     colored::Color,
     regex::Regex,
     std::collections::HashMap,
+    strum::{EnumIter, EnumString},
 };
 
 #[derive(PartialEq, Eq, Hash, Clone, EnumString, EnumIter)]

src/language.rs

@@ -1,7 +1,5 @@
 #[macro_use]
 extern crate clap;
-#[macro_use]
-extern crate strum_macros;
 
 #[cfg(target_os = "linux")]
 use image_backends::ImageBackend;
@@ -19,7 +17,7 @@ use {
         result,
         str::FromStr,
     },
-    strum::{EnumCount, IntoEnumIterator},
+    strum::{EnumCount, EnumIter, EnumString, IntoEnumIterator, IntoStaticStr},
 };
 
 mod ascii_art;
@@ -126,7 +124,7 @@ fn main() -> Result<()> {
                 .help("Allows you to disable an info line from appearing in the output.")
                 .possible_values(
                     &InfoFields::iter()
-                        .take(InfoFields::count() - 1)
+                        .take(InfoFields::COUNT - 1)
                         .map(|field| field.into())
                         .collect::<Vec<&str>>()
                         .as_slice(),