Merge pull request #38 from intel/fix-lints

Fix some linting warnings

Author: JonatanWaern

.github/workflows/scans.yml

@@ -38,6 +38,7 @@ jobs:
         shell: bash
         if: ${{ success() || failure() }}
         run: |
+          rm Cargo.lock
           cargo install cargo-outdated
           cargo outdated --version
           set -o pipefail

src/actions/analysis_storage.rs

@@ -230,7 +230,7 @@ impl AnalysisStorage {
     pub fn get_file_contexts(&self, path: &CanonPath)
                              -> HashSet<Option<CanonPath>> {
         if let Some(deps) = self.dependencies.get(path) {
-            return deps.keys().cloned().collect()
+            deps.keys().cloned().collect()
         } else {
             vec![None].into_iter().collect()
         }

src/analysis/mod.rs

@@ -652,7 +652,7 @@ impl DeviceAnalysis {
     }
 
     fn resolved_to_symbol<'t, 'c>(&'c self, obj: DMLResolvedObject<'t, 'c>)
-                                  -> Option<Vec<&SymbolRef>> {
+                                  -> Option<Vec<&'c SymbolRef>> {
         match obj {
             DMLResolvedObject::CompObject(comp) =>
                 self.symbol_info.object_symbols.get(&comp.key)

src/analysis/reference.rs

@@ -142,7 +142,7 @@ impl std::fmt::Display for Reference {
 }
 
 impl Reference {
-    pub fn as_variable_ref<'t>(&'t self) -> Option<&VariableReference> {
+    pub fn as_variable_ref(&self) -> Option<&VariableReference> {
         match self {
             Reference::Variable(var) => Some(var),
             _ => None,

src/analysis/templating/objects.rs

@@ -869,7 +869,7 @@ impl DMLCompositeObject {
     }
 
     pub fn parameters<'t>(&'t self)
-                          -> impl Iterator<Item=&'t DMLParameter> + '_ {
+                          -> impl Iterator<Item=&'t DMLParameter> + 't {
         self.components.values().filter_map(
             |c| if let DMLObject::ShallowObject(
                 DMLShallowObject {

src/lint/rules/spacing.rs

@@ -49,7 +49,7 @@ impl SpBracesArgs {
             if declarations.is_empty() {
                 return None;
             }
-            return Some(SpBracesArgs {
+            Some(SpBracesArgs {
                 body_start: declarations.first().unwrap().range(),
                 body_end: declarations.last().unwrap().range(),
                 lbrace: l_brace.range(),

src/server/mod.rs

@@ -60,7 +60,6 @@ pub mod message;
 const NOT_INITIALIZED_CODE: i32 = -32002;
 
 /// Runs the DML Language Server.
-
 pub fn run_server(vfs: Arc<Vfs>) -> i32 {
     debug!("Language Server starting up. Version: {}", version());
     let config = Arc::new(Mutex::new(Config::default()));