Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #10545

Browse source 
10545: A few clippy fixes r=Veykril a=Milo123459

A few clippy fixes

Co-authored-by: Milo <50248166+Milo123459@users.noreply.github.com>
This commit is contained in:
bors[bot] 2021-10-14 20:10:59 +00:00 committed by GitHub
commit bfb8f73fb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/cfg/src/lib.rs
View file

@ -113,6 +113,10 @@ impl CfgDiff {
pub fn len(&self) -> usize {
self.enable.len() + self.disable.len()
}
pub fn is_empty(&self) -> bool {
self.len() == 0
}
}
impl fmt::Display for CfgDiff {

2
crates/flycheck/src/lib.rs
View file

@ -297,7 +297,7 @@ impl CargoActor {
read_at_least_one_message = true;
// Try to deserialize a message from Cargo or Rustc.
let mut deserializer = serde_json::Deserializer::from_str(&line);
let mut deserializer = serde_json::Deserializer::from_str(line);
deserializer.disable_recursion_limit();
if let Ok(message) = JsonMessage::deserialize(&mut deserializer) {
match message {

2
crates/ide/src/goto_declaration.rs
View file

@ -57,7 +57,7 @@ mod tests {
.unwrap()
.expect("no declaration or definition found")
.info;
if navs.len() == 0 {
if navs.is_empty() {
panic!("unresolved reference")
}

2
crates/ide/src/syntax_highlighting/highlight.rs
View file

@ -741,7 +741,7 @@ fn parents_match(mut node: NodeOrToken<SyntaxNode, SyntaxToken>, mut kinds: &[Sy
}
// Only true if we matched all expected kinds
kinds.len() == 0
kinds.is_empty()
}
#[inline]

4
crates/syntax/test_data/parser/fuzz-failures/0000.rs
View file

@ -101,7 +101,7 @@ pub /*(meh)*/ fn replace_range(mut text: String, range: TextRange, replace_with:
}
fn is_balanced(tokens: &[Token]) -> bool {
if tokens.len() == 0
if tokens.is_empty()
|| tokens.first().unwrap().kind != L_CURLY
|| tokens.last().unwrap().kind != R_CURLY {
return false
@ -153,7 +153,7 @@ pub /*(meh)*/ fn replace_range(mut text: String, range: TextRange, replace_with:
}
fn is_balanced(tokens: &[Token]) -> bool {
if tokens.len() == 0
if tokens.is_empty()
|| tokens.first().unwrap().kind != L_CURLY
|| tokens.last().unwrap().kind != R_CURLY {
return false