Fixes a lot of clippy warnings

src/environment.rs

@@ -20,11 +20,11 @@ pub struct Environment {
 
 impl Environment {
     #[must_use]
-    pub fn new(settings: Settings) -> Environment {
+    pub fn new(settings: Settings) -> Self {
         let vars = HashMap::<String, String>::new();
         let output = Storage::new();
         let repo = git::Repo::try_from(settings.repo_path.as_deref()).ok();
-        Environment {
+        Self {
             settings,
             vars,
             output,
@@ -33,12 +33,12 @@ impl Environment {
     }
 
     #[must_use]
-    pub fn stub() -> Environment {
+    pub fn stub() -> Self {
         Self::new(STUB.clone())
     }
 
     #[must_use]
-    pub fn repo(&self) -> Option<&git::Repo> {
+    pub const fn repo(&self) -> Option<&git::Repo> {
         // TODO DEPRECATED Just use the repo property directly, instead
         self.repo.as_ref()
     }

src/logger.rs

@@ -14,7 +14,7 @@ use tracing_subscriber::{
     Registry,
 };
 
-fn verbosity_to_level(verbosity: Verbosity) -> LevelFilter {
+const fn verbosity_to_level(verbosity: Verbosity) -> LevelFilter {
     match verbosity {
         Verbosity::None => LevelFilter::OFF,
         Verbosity::Errors => LevelFilter::ERROR,

src/process.rs

@@ -57,9 +57,9 @@ pub fn run(
 ) -> BoxResult<()> {
     sources.sort_unstable_by(|s1, s2| {
         let o_hierarchy = s1.hierarchy().cmp(&s2.hierarchy());
-        if let Ordering::Equal = o_hierarchy {
+        if Ordering::Equal == o_hierarchy {
             let o_type = s1.type_name().cmp(s2.type_name());
-            if let Ordering::Equal = o_type {
+            if Ordering::Equal == o_type {
                 let o_props = s1.properties().cmp(s2.properties());
                 o_props
             } else {
@@ -106,7 +106,7 @@ pub fn run(
             None => {
                 if required {
                     log::warn!("Missing value for required key '{:?}'", key);
-                    if let FailOn::AnyMissingValue = environment.settings.fail_on {
+                    if matches!(environment.settings.fail_on, FailOn::AnyMissingValue) {
                         return Err(validator::Error::Missing.into()); // TODO Should/could this be handled in the validator already?
                     }
                 } else {

src/settings.rs

@@ -23,6 +23,7 @@ use crate::{
     EnumIter,
     IntoStaticStr,
     PartialEq,
+    Eq,
     PartialOrd,
     Copy,
     Clone,
@@ -47,7 +48,7 @@ lazy_static! {
 }
 
 impl Verbosity {
-    fn index(self) -> usize {
+    const fn index(self) -> usize {
         self as usize
     }
 
@@ -71,9 +72,9 @@ impl Verbosity {
 impl From<bool> for Verbosity {
     fn from(verbose: bool) -> Self {
         if verbose {
-            Verbosity::Info
+            Self::Info
         } else {
-            Verbosity::Warnings
+            Self::Warnings
         }
     }
 }
@@ -88,18 +89,18 @@ pub enum Overwrite {
 
 impl Overwrite {
     #[must_use]
-    pub fn main(&self) -> bool {
+    pub const fn main(&self) -> bool {
         match self {
-            Overwrite::All | Overwrite::Main => true,
-            Overwrite::None | Overwrite::Alternative => false,
+            Self::All | Self::Main => true,
+            Self::None | Self::Alternative => false,
         }
     }
 
     #[must_use]
-    pub fn alt(&self) -> bool {
+    pub const fn alt(&self) -> bool {
         match self {
-            Overwrite::All | Overwrite::Alternative => true,
-            Overwrite::None | Overwrite::Main => false,
+            Self::All | Self::Alternative => true,
+            Self::None | Self::Main => false,
         }
     }
 }
@@ -123,9 +124,9 @@ pub enum FailOn {
 impl From<bool> for FailOn {
     fn from(verbose: bool) -> Self {
         if verbose {
-            FailOn::AnyMissingValue
+            Self::AnyMissingValue
         } else {
-            FailOn::Error
+            Self::Error
         }
     }
 }
@@ -156,10 +157,10 @@ pub struct Settings /*<S: ::std::hash::BuildHasher>*/ {
 }
 
 impl Settings {
-    fn stub() -> Settings {
+    fn stub() -> Self {
         let mut all_keys = HashSet::<Key>::new();
         all_keys.extend(Key::iter());
-        Settings {
+        Self {
             repo_path: None,
             required_keys: all_keys,
             overwrite: Overwrite::All,
@@ -178,7 +179,7 @@ impl Settings {
     /// from the given (possible) repo hosting URL (any form of it).
     #[must_use]
     pub fn hosting_type(&self, url: &Url) -> HostingType {
-        if let HostingType::Unknown = self.hosting_type {
+        if HostingType::Unknown == self.hosting_type {
             HostingType::from(PublicSite::from(url.host()))
         } else {
             self.hosting_type
@@ -187,7 +188,7 @@ impl Settings {
 
     #[must_use]
     pub fn hosting_type_from_host(&self, host: &str) -> HostingType {
-        if let HostingType::Unknown = self.hosting_type {
+        if HostingType::Unknown == self.hosting_type {
             let host_assumed_domain = url::Host::Domain(host);
             HostingType::from(PublicSite::from(host_assumed_domain))
         } else {
@@ -197,7 +198,7 @@ impl Settings {
 
     #[must_use]
     pub fn hosting_type_from_hosting_suffix(&self, url: &Url) -> HostingType {
-        if let HostingType::Unknown = self.hosting_type {
+        if HostingType::Unknown == self.hosting_type {
             HostingType::from(PublicSite::from_hosting_domain_option(url.host().as_ref()))
         } else {
             self.hosting_type

src/sinks/env.rs

@@ -27,6 +27,6 @@ impl super::VarSink for VarSink {
 
 impl fmt::Display for VarSink {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", std::any::type_name::<VarSink>())
+        write!(f, "{}", std::any::type_name::<Self>())
     }
 }

src/sinks/file.rs

@@ -62,7 +62,7 @@ impl fmt::Display for VarSink {
         write!(
             f,
             "{}(file: {})",
-            std::any::type_name::<VarSink>(),
+            std::any::type_name::<Self>(),
             self.file.as_path().to_str().ok_or(fmt::Error {})?
         )
     }

src/sinks/json.rs

@@ -75,7 +75,7 @@ impl fmt::Display for VarSink {
         write!(
             f,
             "{}(file: {})",
-            std::any::type_name::<VarSink>(),
+            std::any::type_name::<Self>(),
             self.file.as_path().to_str().ok_or(fmt::Error {})?
         )
     }

src/sinks/mod.rs

@@ -77,9 +77,10 @@ pub fn cli_list(
         sinks.clear();
     } else if sinks.is_empty() {
         log::warn!("No sinks registered! The results of this run will not be stored anywhere.");
-    }
-    for sink in &sinks {
-        log::trace!("Registered sink {}.", sink);
+    } else {
+        for sink in &sinks {
+            log::trace!("Registered sink {}.", sink);
+        }
     }
     sinks
 }

src/sources/bitbucket_ci.rs

@@ -27,7 +27,7 @@ impl super::VarSource for VarSource {
     }
 
     fn type_name(&self) -> &'static str {
-        std::any::type_name::<VarSource>()
+        std::any::type_name::<Self>()
     }
 
     fn properties(&self) -> &Vec<String> {

src/sources/deriver.rs

@@ -124,7 +124,7 @@ impl super::VarSource for VarSource {
     }
 
     fn type_name(&self) -> &'static str {
-        std::any::type_name::<VarSource>()
+        std::any::type_name::<Self>()
     }
 
     fn properties(&self) -> &Vec<String> {

src/sources/env.rs

@@ -28,7 +28,7 @@ impl super::VarSource for VarSource {
     }
 
     fn type_name(&self) -> &'static str {
-        std::any::type_name::<VarSource>()
+        std::any::type_name::<Self>()
     }
 
     fn properties(&self) -> &Vec<String> {

src/sources/fs.rs

@@ -10,7 +10,7 @@ use crate::cleanup;
 use crate::environment::Environment;
 use crate::license;
 use crate::std_error;
-use crate::var::{Confidence, Key, C_HIGH, C_LOW, C_MIDDLE};
+use crate::var::{Confidence, Key, C_HIGH, C_LOW};
 use std::path::{Path, PathBuf};
 use std::{env, fs};
 
@@ -167,7 +167,7 @@ impl super::VarSource for VarSource {
     }
 
     fn type_name(&self) -> &'static str {
-        std::any::type_name::<VarSource>()
+        std::any::type_name::<Self>()
     }
 
     fn properties(&self) -> &Vec<String> {

src/sources/git.rs

@@ -75,7 +75,7 @@ impl super::VarSource for VarSource {
     }
 
     fn type_name(&self) -> &'static str {
-        std::any::type_name::<VarSource>()
+        std::any::type_name::<Self>()
     }
 
     fn properties(&self) -> &Vec<String> {

src/sources/github_ci.rs

@@ -63,7 +63,7 @@ impl super::VarSource for VarSource {
     }
 
     fn type_name(&self) -> &'static str {
-        std::any::type_name::<VarSource>()
+        std::any::type_name::<Self>()
     }
 
     fn properties(&self) -> &Vec<String> {

src/sources/gitlab_ci.rs

@@ -28,7 +28,7 @@ impl super::VarSource for VarSource {
     }
 
     fn type_name(&self) -> &'static str {
-        std::any::type_name::<VarSource>()
+        std::any::type_name::<Self>()
     }
 
     fn properties(&self) -> &Vec<String> {

src/sources/jenkins_ci.rs

@@ -24,7 +24,7 @@ impl super::VarSource for VarSource {
     }
 
     fn type_name(&self) -> &'static str {
-        std::any::type_name::<VarSource>()
+        std::any::type_name::<Self>()
     }
 
     fn properties(&self) -> &Vec<String> {

src/sources/selector.rs

@@ -51,7 +51,7 @@ impl super::VarSource for VarSource {
     }
 
     fn type_name(&self) -> &'static str {
-        std::any::type_name::<VarSource>()
+        std::any::type_name::<Self>()
     }
 
     fn properties(&self) -> &Vec<String> {

src/sources/travis_ci.rs

@@ -28,7 +28,7 @@ impl super::VarSource for VarSource {
     }
 
     fn type_name(&self) -> &'static str {
-        std::any::type_name::<VarSource>()
+        std::any::type_name::<Self>()
     }
 
     fn properties(&self) -> &Vec<String> {

src/storage.rs

@@ -39,8 +39,8 @@ macro_rules! quote_empty {
 
 impl Storage {
     /// Creates a new, empty instance of a storage.
-    pub fn new() -> Storage {
-        Storage {
+    pub fn new() -> Self {
+        Self {
             key_values: HashMap::new(),
             key_primary: HashMap::new(),
         }

src/tools/git.rs

@@ -27,7 +27,7 @@ pub struct Error {
 
 impl From<&str> for Error {
     fn from(message: &str) -> Self {
-        Error {
+        Self {
             from: git2::Error::from_str("PLACEHOLDER"),
             message: String::from(message),
         }
@@ -67,6 +67,7 @@ pub enum TransferProtocol {
 }
 
 impl TransferProtocol {
+    #[must_use]
     pub const fn scheme_str(self) -> &'static str {
         match self {
             Self::Git => "git",
@@ -75,6 +76,7 @@ impl TransferProtocol {
         }
     }
 
+    #[must_use]
     pub const fn to_clone_url_key(self) -> Key {
         match self {
             Self::Git => Key::RepoCloneUrlGit,
@@ -109,7 +111,7 @@ pub fn is_git_dirty_version(vers: &str) -> bool {
 /// Returns true if the repo contains any tags.
 fn _has_tags(repo: &git2::Repository) -> bool {
     let mut has_tags = false;
-    repo.tag_foreach(|_, _| {
+    let _ = repo.tag_foreach(|_, _| {
         has_tags = true;
         false
     });
@@ -155,7 +157,7 @@ impl TryFrom<Option<&str>> for Repo {
     type Error = git2::Error;
     fn try_from(repo_root: Option<&str>) -> Result<Self, Self::Error> {
         let repo_root = repo_root.unwrap_or(".");
-        Ok(Repo {
+        Ok(Self {
             repo: Repository::open(repo_root)?,
         })
     }
@@ -165,7 +167,7 @@ impl TryFrom<Option<&Path>> for Repo {
     type Error = git2::Error;
     fn try_from(repo_root: Option<&Path>) -> Result<Self, Self::Error> {
         let repo_root = repo_root.unwrap_or_else(|| Path::new("."));
-        Ok(Repo {
+        Ok(Self {
             repo: Repository::open(repo_root)?,
         })
     }
@@ -187,7 +189,7 @@ impl Repo {
     // }
 
     #[must_use]
-    pub fn inner(&self) -> &git2::Repository {
+    pub const fn inner(&self) -> &git2::Repository {
         &self.repo
     }
 

src/tools/git_clone_url.rs

@@ -32,6 +32,14 @@ macro_rules! let_named_cap {
 //pub(crate) use let_named_cap;
 
 impl<'a> PartsRef<'a> {
+    /// Parses a git clone URL of any type -
+    /// including non URL spec compliant ones -
+    /// into a set of basic parts.
+    ///
+    /// # Errors
+    ///
+    /// If our internal regex to parse a git clone URL
+    /// does not match the supplied string.
     pub fn parse<'b>(any_clone_url: &'b str) -> Result<PartsRef<'a>, String>
     where
         'b: 'a,