language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-02 04:48:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

cargo clippy --fix

Browse source
This commit is contained in:
Lukas Wirth 2025-07-31 10:30:22 +02:00
parent 423c7dd23a
commit 8ce30264c8
186 changed files with 3056 additions and 3314 deletions
Download patch file Download diff file Expand all files Collapse all files

69
crates/parser/src/grammar/expressions.rs
View file

@ -77,38 +77,38 @@ pub(super) fn stmt(p: &mut Parser<'_>, semicolon: Semicolon) {
return;
}
if let Some((cm, blocklike)) = expr_stmt(p, Some(m)) {
if !(p.at(T!['}']) || (semicolon != Semicolon::Required && p.at(EOF))) {
// test no_semi_after_block
// fn foo() {
// if true {}
// loop {}
// match () {}
// while true {}
// for _ in () {}
// {}
// {}
// macro_rules! test {
// () => {}
// }
// test!{}
// }
let m = cm.precede(p);
match semicolon {
Semicolon::Required => {
if blocklike.is_block() {
p.eat(T![;]);
} else {
p.expect(T![;]);
}
}
Semicolon::Optional => {
if let Some((cm, blocklike)) = expr_stmt(p, Some(m))
&& !(p.at(T!['}']) || (semicolon != Semicolon::Required && p.at(EOF)))
{
// test no_semi_after_block
// fn foo() {
// if true {}
// loop {}
// match () {}
// while true {}
// for _ in () {}
// {}
// {}
// macro_rules! test {
// () => {}
// }
// test!{}
// }
let m = cm.precede(p);
match semicolon {
Semicolon::Required => {
if blocklike.is_block() {
p.eat(T![;]);
} else {
p.expect(T![;]);
}
Semicolon::Forbidden => (),
}
m.complete(p, EXPR_STMT);
Semicolon::Optional => {
p.eat(T![;]);
}
Semicolon::Forbidden => (),
}
m.complete(p, EXPR_STMT);
}
}
@ -134,14 +134,11 @@ pub(super) fn let_stmt(p: &mut Parser<'_>, with_semi: Semicolon) {
if p.at(T![else]) {
// test_err let_else_right_curly_brace
// fn func() { let Some(_) = {Some(1)} else { panic!("h") };}
if let Some(expr) = expr_after_eq {
if let Some(token) = expr.last_token(p) {
if token == T!['}'] {
p.error(
"right curly brace `}` before `else` in a `let...else` statement not allowed"
)
}
}
if let Some(expr) = expr_after_eq
&& let Some(token) = expr.last_token(p)
&& token == T!['}']
{
p.error("right curly brace `}` before `else` in a `let...else` statement not allowed")
}
// test let_else

2
crates/parser/src/input.rs
View file

@ -61,7 +61,7 @@ impl Input {
#[inline]
fn push_impl(&mut self, kind: SyntaxKind, contextual_kind: SyntaxKind) {
let idx = self.len();
if idx % (bits::BITS as usize) == 0 {
if idx.is_multiple_of(bits::BITS as usize) {
self.joint.push(0);
}
self.kind.push(kind);

8
crates/parser/src/shortcuts.rs
View file

@ -252,10 +252,10 @@ fn n_attached_trivias<'a>(
WHITESPACE if text.contains("\n\n") => {
// we check whether the next token is a doc-comment
// and skip the whitespace in this case
if let Some((COMMENT, peek_text)) = trivias.peek().map(|(_, pair)| pair) {
if is_outer(peek_text) {
continue;
}
if let Some((COMMENT, peek_text)) = trivias.peek().map(|(_, pair)| pair)
&& is_outer(peek_text)
{
continue;
}
break;
}