From 892ec098961c99833d6da255d9d55e8ebd262d8b Mon Sep 17 00:00:00 2001
From: Lukas Scheller <lukas2121@icloud.com>
Date: Wed, 7 Aug 2024 17:35:53 +0200
Subject: [PATCH] Simplify config.rs

---
 vhdl_lang/src/config.rs | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/vhdl_lang/src/config.rs b/vhdl_lang/src/config.rs
index be0be812..5e793eee 100644
--- a/vhdl_lang/src/config.rs
+++ b/vhdl_lang/src/config.rs
@@ -13,6 +13,7 @@ use std::io::prelude::*;
 use std::path::Path;
 
 use fnv::FnvHashMap;
+use itertools::Itertools;
 use subst::VariableMap;
 use toml::{Table, Value};
 
@@ -50,7 +51,7 @@ impl LibraryConfig {
             };
 
             if is_literal(stripped_pattern) {
-                let file_path = Path::new(pattern).to_owned();
+                let file_path = PathBuf::from(pattern);
 
                 if file_path.exists() {
                     result.push(file_path);
@@ -86,20 +87,8 @@ impl LibraryConfig {
                 }
             }
         }
-        Self::remove_duplicates(result)
-    }
-
-    /// Remove duplicate file names from the result
-    fn remove_duplicates(file_names: Vec<PathBuf>) -> Vec<PathBuf> {
-        let mut result = Vec::with_capacity(file_names.len());
-        let mut fileset = std::collections::HashSet::new();
-
-        for file_name in file_names.into_iter() {
-            if fileset.insert(file_name.clone()) {
-                result.push(file_name);
-            }
-        }
-        result
+        // Remove duplicate file names from the result
+        result.into_iter().unique().collect()
     }
 
     /// Returns the name of the library
@@ -412,15 +401,7 @@ where
 
 /// Returns true if the pattern is a plain file name and not a glob pattern
 fn is_literal(pattern: &str) -> bool {
-    for chr in pattern.chars() {
-        match chr {
-            '?' | '*' | '[' => {
-                return false;
-            }
-            _ => {}
-        }
-    }
-    true
+    !pattern.chars().any(|chr| matches!(&chr, '?' | '*' | '['))
 }
 
 #[cfg(test)]