Fix 1.66 clippy warnings

Author: kraigher

vhdl_lang/src/analysis/analyze.rs

@@ -225,16 +225,9 @@ impl<'a> AnalyzeContext<'a> {
         let units = self.root.get_library_units(self.work_library_name())?;
 
         let name = self.current_unit.primary_name();
-
-        if let Some(unit) = units.get(&UnitKey::Secondary(name.clone(), name.clone())) {
-            if unit.kind() == AnyKind::Secondary(SecondaryKind::PackageBody) {
-                Some(unit)
-            } else {
-                None
-            }
-        } else {
-            None
-        }
+        units
+            .get(&UnitKey::Secondary(name.clone(), name.clone()))
+            .filter(|&unit| unit.kind() == AnyKind::Secondary(SecondaryKind::PackageBody))
     }
 
     pub fn has_package_body(&self) -> bool {

vhdl_lang/src/analysis/visibility.rs

@@ -185,8 +185,8 @@ impl<'a> Visible<'a> {
     ) -> Result<Option<NamedEntities>, Diagnostic> {
         let mut named_entities: Vec<_> = self
             .visible_entities
-            .iter()
-            .map(|(_, ent)| ent.entity.clone())
+            .values()
+            .map(|ent| ent.entity.clone())
             .collect();
 
         if named_entities.is_empty() {

vhdl_lang/src/data/source.rs

@@ -178,7 +178,7 @@ impl Source {
 }
 
 /// A lexical position (line, column) in a source.
-#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, Debug)]
+#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, Debug, Default)]
 pub struct Position {
     /// Line (zero-based).
     pub line: u32,
@@ -187,13 +187,6 @@ pub struct Position {
 }
 
 impl Position {
-    pub fn default() -> Position {
-        Position {
-            line: 0,
-            character: 0,
-        }
-    }
-
     pub fn new(line: u32, character: u32) -> Position {
         Position { line, character }
     }

vhdl_lang/src/syntax/tokens/tokenstream.rs

@@ -68,7 +68,7 @@ impl<'a> TokenStream<'a> {
             Err(self
                 .tokenizer
                 .eof_error()
-                .when(&format!("expecting {}", kinds_str(&[kind]))))
+                .when(format!("expecting {}", kinds_str(&[kind]))))
         }
     }
 

vhdl_ls/src/vhdl_server.rs

@@ -456,8 +456,8 @@ fn srcpos_to_location(pos: &SrcPos) -> Location {
 
 fn from_lsp_pos(position: lsp_types::Position) -> vhdl_lang::Position {
     vhdl_lang::Position {
-        line: position.line as u32,
-        character: position.character as u32,
+        line: position.line,
+        character: position.character,
     }
 }