diff --git a/.github/workflows/scans.yml b/.github/workflows/scans.yml index 3b6d94a..4d5f5aa 100644 --- a/.github/workflows/scans.yml +++ b/.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 diff --git a/src/actions/analysis_storage.rs b/src/actions/analysis_storage.rs index 3b9320d..636e84c 100644 --- a/src/actions/analysis_storage.rs +++ b/src/actions/analysis_storage.rs @@ -230,7 +230,7 @@ impl AnalysisStorage { pub fn get_file_contexts(&self, path: &CanonPath) -> HashSet> { if let Some(deps) = self.dependencies.get(path) { - return deps.keys().cloned().collect() + deps.keys().cloned().collect() } else { vec![None].into_iter().collect() } diff --git a/src/analysis/mod.rs b/src/analysis/mod.rs index d4d54de..a763dc7 100644 --- a/src/analysis/mod.rs +++ b/src/analysis/mod.rs @@ -652,7 +652,7 @@ impl DeviceAnalysis { } fn resolved_to_symbol<'t, 'c>(&'c self, obj: DMLResolvedObject<'t, 'c>) - -> Option> { + -> Option> { match obj { DMLResolvedObject::CompObject(comp) => self.symbol_info.object_symbols.get(&comp.key) diff --git a/src/analysis/reference.rs b/src/analysis/reference.rs index 76b89b7..863e658 100644 --- a/src/analysis/reference.rs +++ b/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, diff --git a/src/analysis/templating/objects.rs b/src/analysis/templating/objects.rs index 952cc52..5c1d122 100644 --- a/src/analysis/templating/objects.rs +++ b/src/analysis/templating/objects.rs @@ -869,7 +869,7 @@ impl DMLCompositeObject { } pub fn parameters<'t>(&'t self) - -> impl Iterator + '_ { + -> impl Iterator + 't { self.components.values().filter_map( |c| if let DMLObject::ShallowObject( DMLShallowObject { diff --git a/src/lint/rules/spacing.rs b/src/lint/rules/spacing.rs index a7c7447..4b1ecdc 100644 --- a/src/lint/rules/spacing.rs +++ b/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(), diff --git a/src/server/mod.rs b/src/server/mod.rs index 023fdc7..3a06023 100644 --- a/src/server/mod.rs +++ b/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) -> i32 { debug!("Language Server starting up. Version: {}", version()); let config = Arc::new(Mutex::new(Config::default()));