language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-02 12:59:12 +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

22
crates/syntax-bridge/src/lib.rs
View file

@ -768,17 +768,17 @@ where
}
fn bump(&mut self) -> Option<(Self::Token, TextRange)> {
if let Some((punct, offset)) = self.punct_offset.clone() {
if usize::from(offset) + 1 < punct.text().len() {
let offset = offset + TextSize::of('.');
let range = punct.text_range();
self.punct_offset = Some((punct.clone(), offset));
let range = TextRange::at(range.start() + offset, TextSize::of('.'));
return Some((
SynToken::Punct { token: punct, offset: u32::from(offset) as usize },
range,
));
}
if let Some((punct, offset)) = self.punct_offset.clone()
&& usize::from(offset) + 1 < punct.text().len()
{
let offset = offset + TextSize::of('.');
let range = punct.text_range();
self.punct_offset = Some((punct.clone(), offset));
let range = TextRange::at(range.start() + offset, TextSize::of('.'));
return Some((
SynToken::Punct { token: punct, offset: u32::from(offset) as usize },
range,
));
}
if let Some(leaf) = self.current_leaves.pop() {

9
crates/syntax-bridge/src/prettify_macro_expansion.rs
View file

@ -61,10 +61,11 @@ pub fn prettify_macro_expansion(
}
_ => continue,
};
if token.kind() == SyntaxKind::IDENT && token.text() == "$crate" {
if let Some(replacement) = dollar_crate_replacement(&token) {
dollar_crate_replacements.push((token.clone(), replacement));
}
if token.kind() == SyntaxKind::IDENT
&& token.text() == "$crate"
&& let Some(replacement) = dollar_crate_replacement(&token)
{
dollar_crate_replacements.push((token.clone(), replacement));
}
let tok = &token;

9
crates/syntax-bridge/src/tests.rs
View file

@ -34,14 +34,11 @@ fn check_punct_spacing(fixture: &str) {
while !cursor.eof() {
while let Some(token_tree) = cursor.token_tree() {
if let tt::TokenTree::Leaf(Leaf::Punct(Punct {
spacing,
span: Span { range, .. },
..
spacing, span: Span { range, .. }, ..
})) = token_tree
&& let Some(expected) = annotations.remove(range)
{
if let Some(expected) = annotations.remove(range) {
assert_eq!(expected, *spacing);
}
assert_eq!(expected, *spacing);
}
cursor.bump();
}

20
crates/syntax-bridge/src/to_parser_input.rs
View file

@ -21,17 +21,17 @@ pub fn to_parser_input<Ctx: Copy + fmt::Debug + PartialEq + Eq + Hash>(
let tt = current.token_tree();
// Check if it is lifetime
if let Some(tt::TokenTree::Leaf(tt::Leaf::Punct(punct))) = tt {
if punct.char == '\'' {
current.bump();
match current.token_tree() {
Some(tt::TokenTree::Leaf(tt::Leaf::Ident(_ident))) => {
res.push(LIFETIME_IDENT);
current.bump();
continue;
}
_ => panic!("Next token must be ident"),
if let Some(tt::TokenTree::Leaf(tt::Leaf::Punct(punct))) = tt
&& punct.char == '\''
{
current.bump();
match current.token_tree() {
Some(tt::TokenTree::Leaf(tt::Leaf::Ident(_ident))) => {
res.push(LIFETIME_IDENT);
current.bump();
continue;
}
_ => panic!("Next token must be ident"),
}
}