Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 06:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: various clippy lints

Browse source
This commit is contained in:
Alexis (Poliorcetics) Bourget 2023-05-07 09:43:37 +02:00
parent 900d6030e7
commit d7fdf141a4
5 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/hir-def/src/body/pretty.rs
View file

@ -35,11 +35,10 @@ pub(super) fn print_body_hir(db: &dyn DefDatabase, body: &Body, owner: DefWithBo
DefWithBodyId::VariantId(it) => { DefWithBodyId::VariantId(it) => {
let src = it.parent.child_source(db); let src = it.parent.child_source(db);
let variant = &src.value[it.local_id]; let variant = &src.value[it.local_id];
let name = match &variant.name() { match &variant.name() {
Some(name) => name.to_string(), Some(name) => name.to_string(),
None => "_".to_string(), None => "_".to_string(),
}; }
format!("{name}")
} }
}; };
@ -445,7 +444,7 @@ impl<'a> Printer<'a> {
fn print_block( fn print_block(
&mut self, &mut self,
label: Option<&str>, label: Option<&str>,
statements: &Box<[Statement]>, statements: &[Statement],
tail: &Option<la_arena::Idx<Expr>>, tail: &Option<la_arena::Idx<Expr>>,
) { ) {
self.whitespace(); self.whitespace();
@ -455,7 +454,7 @@ impl<'a> Printer<'a> {
w!(self, "{{"); w!(self, "{{");
if !statements.is_empty() || tail.is_some() { if !statements.is_empty() || tail.is_some() {
self.indented(|p| { self.indented(|p| {
for stmt in &**statements { for stmt in statements {
p.print_stmt(stmt); p.print_stmt(stmt);
} }
if let Some(tail) = tail { if let Some(tail) = tail {

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

@ -205,7 +205,7 @@ impl<'t> Parser<'t> {
marker.bomb.defuse(); marker.bomb.defuse();
marker = new_marker; marker = new_marker;
}; };
self.pos += 1 as usize; self.pos += 1;
self.push_event(Event::FloatSplitHack { ends_in_dot }); self.push_event(Event::FloatSplitHack { ends_in_dot });
(ends_in_dot, marker) (ends_in_dot, marker)
} }

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

@ -46,10 +46,8 @@ impl<'a> LexedStr<'a> {
// Tag the token as joint if it is float with a fractional part // Tag the token as joint if it is float with a fractional part
// we use this jointness to inform the parser about what token split // we use this jointness to inform the parser about what token split
// event to emit when we encounter a float literal in a field access // event to emit when we encounter a float literal in a field access
if kind == SyntaxKind::FLOAT_NUMBER { if kind == SyntaxKind::FLOAT_NUMBER && !self.text(i).ends_with('.') {
if !self.text(i).ends_with('.') { res.was_joint();
res.was_joint();
}
} }
} }

3
crates/syntax/src/ast/expr_ext.rs
View file

@ -366,8 +366,7 @@ impl ast::BlockExpr {
match parent.kind() { match parent.kind() {
FOR_EXPR | IF_EXPR => parent FOR_EXPR | IF_EXPR => parent
.children() .children()
.filter(|it| ast::Expr::can_cast(it.kind())) .find(|it| ast::Expr::can_cast(it.kind()))
.next()
.map_or(true, |it| it == *self.syntax()), .map_or(true, |it| it == *self.syntax()),
LET_ELSE | FN | WHILE_EXPR | LOOP_EXPR | CONST_BLOCK_PAT => false, LET_ELSE | FN | WHILE_EXPR | LOOP_EXPR | CONST_BLOCK_PAT => false,
_ => true, _ => true,

4
crates/syntax/src/ast/make.rs
View file

@ -195,7 +195,7 @@ pub fn ty_alias(
} }
} }
s.push_str(";"); s.push(';');
ast_from_text(&s) ast_from_text(&s)
} }
@ -399,7 +399,7 @@ pub fn hacky_block_expr(
format_to!(buf, " {t}\n") format_to!(buf, " {t}\n")
} else if kind == SyntaxKind::WHITESPACE { } else if kind == SyntaxKind::WHITESPACE {
let content = t.text().trim_matches(|c| c != '\n'); let content = t.text().trim_matches(|c| c != '\n');
if content.len() >= 1 { if !content.is_empty() {
format_to!(buf, "{}", &content[1..]) format_to!(buf, "{}", &content[1..])
} }
} }