Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/scans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
shell: bash
if: ${{ success() || failure() }}
run: |
rm Cargo.lock
cargo install cargo-outdated
cargo outdated --version
set -o pipefail
Expand Down
2 changes: 1 addition & 1 deletion src/actions/analysis_storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/reference.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/templating/objects.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/lint/rules/spacing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
1 change: 0 additions & 1 deletion src/server/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down
Loading