Skip to content

Commit 6f285aa

Browse files
committed
fix: Fix clippy warnings for all targets
1 parent 45c7744 commit 6f285aa

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

vhdl_lang/src/analysis/tests/incremental_analysis.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,8 @@ fn check_analysis_equal(got: &mut DesignRoot, expected: &mut DesignRoot) -> Vec<
311311

312312
// Check that all references are equal, ensures the incremental
313313
// analysis has cleared refereces
314-
use std::iter::FromIterator;
315-
let got_refs = FnvHashSet::from_iter(FindAnyReferences::search(got).into_iter());
316-
let expected_refs = FnvHashSet::from_iter(FindAnyReferences::search(expected).into_iter());
314+
let got_refs: FnvHashSet<_> = FindAnyReferences::search(got).into_iter().collect();
315+
let expected_refs: FnvHashSet<_> = FindAnyReferences::search(expected).into_iter().collect();
317316
let diff: FnvHashSet<_> = got_refs.symmetric_difference(&expected_refs).collect();
318317
assert_eq!(diff, FnvHashSet::default());
319318

vhdl_lang/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ lib1.files = [
372372
)
373373
.unwrap();
374374
let mut libraries: Vec<&str> = config.iter_libraries().map(|lib| lib.name()).collect();
375-
libraries.sort();
375+
libraries.sort_unstable();
376376
assert_eq!(libraries, &["lib1", "lib2"]);
377377

378378
let lib1 = config.get_library("lib1").unwrap();

vhdl_lang/src/syntax/tokens/tokenstream.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -332,12 +332,7 @@ mod tests {
332332
let code = Code::new("a begin for + ;");
333333
new_stream!(code, stream);
334334

335-
assert!(stream
336-
.skip_until(|ref k| match k {
337-
Plus => true,
338-
_ => false,
339-
})
340-
.is_ok());
335+
assert!(stream.skip_until(|ref k| matches!(k, Plus)).is_ok());
341336
assert_eq!(stream.peek().map(|t| t.map(|t| t.kind)), Ok(Some(Plus)));
342337
}
343338
}

0 commit comments

Comments
 (0)