language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix unnecessary braces warnings

Browse source
This commit is contained in:
Laurențiu Nicola 2020-04-06 17:21:33 +03:00
parent 2603a9e628
commit 52fd2c8e48
12 changed files with 73 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/ra_hir/src/semantics/source_to_def.rs
View file

@ -208,12 +208,12 @@ impl SourceToDefCtx<'_, '_> {
for container in src.cloned().ancestors_with_macros(self.db.upcast()).skip(1) { for container in src.cloned().ancestors_with_macros(self.db.upcast()).skip(1) {
let res: GenericDefId = match_ast! { let res: GenericDefId = match_ast! {
match (container.value) { match (container.value) {
ast::FnDef(it) => { self.fn_to_def(container.with_value(it))?.into() }, ast::FnDef(it) => self.fn_to_def(container.with_value(it))?.into(),
ast::StructDef(it) => { self.struct_to_def(container.with_value(it))?.into() }, ast::StructDef(it) => self.struct_to_def(container.with_value(it))?.into(),
ast::EnumDef(it) => { self.enum_to_def(container.with_value(it))?.into() }, ast::EnumDef(it) => self.enum_to_def(container.with_value(it))?.into(),
ast::TraitDef(it) => { self.trait_to_def(container.with_value(it))?.into() }, ast::TraitDef(it) => self.trait_to_def(container.with_value(it))?.into(),
ast::TypeAliasDef(it) => { self.type_alias_to_def(container.with_value(it))?.into() }, ast::TypeAliasDef(it) => self.type_alias_to_def(container.with_value(it))?.into(),
ast::ImplDef(it) => { self.impl_to_def(container.with_value(it))?.into() }, ast::ImplDef(it) => self.impl_to_def(container.with_value(it))?.into(),
_ => continue, _ => continue,
} }
}; };
@ -226,9 +226,9 @@ impl SourceToDefCtx<'_, '_> {
for container in src.cloned().ancestors_with_macros(self.db.upcast()).skip(1) { for container in src.cloned().ancestors_with_macros(self.db.upcast()).skip(1) {
let res: DefWithBodyId = match_ast! { let res: DefWithBodyId = match_ast! {
match (container.value) { match (container.value) {
ast::ConstDef(it) => { self.const_to_def(container.with_value(it))?.into() }, ast::ConstDef(it) => self.const_to_def(container.with_value(it))?.into(),
ast::StaticDef(it) => { self.static_to_def(container.with_value(it))?.into() }, ast::StaticDef(it) => self.static_to_def(container.with_value(it))?.into(),
ast::FnDef(it) => { self.fn_to_def(container.with_value(it))?.into() }, ast::FnDef(it) => self.fn_to_def(container.with_value(it))?.into(),
_ => continue, _ => continue,
} }
}; };

6
crates/ra_hir_expand/src/builtin_derive.rs
View file

@ -73,9 +73,9 @@ fn parse_adt(tt: &tt::Subtree) -> Result<BasicAdtInfo, mbe::ExpandError> {
let node = item.syntax(); let node = item.syntax();
let (name, params) = match_ast! { let (name, params) = match_ast! {
match node { match node {
ast::StructDef(it) => { (it.name(), it.type_param_list()) }, ast::StructDef(it) => (it.name(), it.type_param_list()),
ast::EnumDef(it) => { (it.name(), it.type_param_list()) }, ast::EnumDef(it) => (it.name(), it.type_param_list()),
ast::UnionDef(it) => { (it.name(), it.type_param_list()) }, ast::UnionDef(it) => (it.name(), it.type_param_list()),
_ => { _ => {
debug!("unexpected node is {:?}", node); debug!("unexpected node is {:?}", node);
return Err(mbe::ExpandError::ConversionError) return Err(mbe::ExpandError::ConversionError)

14
crates/ra_ide/src/call_info.rs
View file

@ -109,7 +109,7 @@ impl FnCallNode {
syntax.ancestors().find_map(|node| { syntax.ancestors().find_map(|node| {
match_ast! { match_ast! {
match node { match node {
ast::CallExpr(it) => { Some(FnCallNode::CallExpr(it)) }, ast::CallExpr(it) => Some(FnCallNode::CallExpr(it)),
ast::MethodCallExpr(it) => { ast::MethodCallExpr(it) => {
let arg_list = it.arg_list()?; let arg_list = it.arg_list()?;
if !syntax.text_range().is_subrange(&arg_list.syntax().text_range()) { if !syntax.text_range().is_subrange(&arg_list.syntax().text_range()) {
@ -117,8 +117,8 @@ impl FnCallNode {
} }
Some(FnCallNode::MethodCallExpr(it)) Some(FnCallNode::MethodCallExpr(it))
}, },
ast::MacroCall(it) => { Some(FnCallNode::MacroCallExpr(it)) }, ast::MacroCall(it) => Some(FnCallNode::MacroCallExpr(it)),
_ => { None }, _ => None,
} }
} }
}) })
@ -127,10 +127,10 @@ impl FnCallNode {
pub(crate) fn with_node_exact(node: &SyntaxNode) -> Option<FnCallNode> { pub(crate) fn with_node_exact(node: &SyntaxNode) -> Option<FnCallNode> {
match_ast! { match_ast! {
match node { match node {
ast::CallExpr(it) => { Some(FnCallNode::CallExpr(it)) }, ast::CallExpr(it) => Some(FnCallNode::CallExpr(it)),
ast::MethodCallExpr(it) => { Some(FnCallNode::MethodCallExpr(it)) }, ast::MethodCallExpr(it) => Some(FnCallNode::MethodCallExpr(it)),
ast::MacroCall(it) => { Some(FnCallNode::MacroCallExpr(it)) }, ast::MacroCall(it) => Some(FnCallNode::MacroCallExpr(it)),
_ => { None }, _ => None,
} }
} }
} }

4
crates/ra_ide/src/completion/complete_fn_param.rs
View file

@ -18,8 +18,8 @@ pub(super) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
for node in ctx.token.parent().ancestors() { for node in ctx.token.parent().ancestors() {
match_ast! { match_ast! {
match node { match node {
ast::SourceFile(it) => { process(it, &mut params) }, ast::SourceFile(it) => process(it, &mut params),
ast::ItemList(it) => { process(it, &mut params) }, ast::ItemList(it) => process(it, &mut params),
_ => (), _ => (),
} }
} }

6
crates/ra_ide/src/completion/complete_keyword.rs
View file

@ -86,9 +86,9 @@ fn is_in_loop_body(leaf: &SyntaxToken) -> bool {
} }
let loop_body = match_ast! { let loop_body = match_ast! {
match node { match node {
ast::ForExpr(it) => { it.loop_body() }, ast::ForExpr(it) => it.loop_body(),
ast::WhileExpr(it) => { it.loop_body() }, ast::WhileExpr(it) => it.loop_body(),
ast::LoopExpr(it) => { it.loop_body() }, ast::LoopExpr(it) => it.loop_body(),
_ => None, _ => None,
} }
}; };

42
crates/ra_ide/src/display/navigation_target.rs
View file

@ -399,17 +399,17 @@ pub(crate) fn docs_from_symbol(db: &RootDatabase, symbol: &FileSymbol) -> Option
match_ast! { match_ast! {
match node { match node {
ast::FnDef(it) => { it.doc_comment_text() }, ast::FnDef(it) => it.doc_comment_text(),
ast::StructDef(it) => { it.doc_comment_text() }, ast::StructDef(it) => it.doc_comment_text(),
ast::EnumDef(it) => { it.doc_comment_text() }, ast::EnumDef(it) => it.doc_comment_text(),
ast::TraitDef(it) => { it.doc_comment_text() }, ast::TraitDef(it) => it.doc_comment_text(),
ast::Module(it) => { it.doc_comment_text() }, ast::Module(it) => it.doc_comment_text(),
ast::TypeAliasDef(it) => { it.doc_comment_text() }, ast::TypeAliasDef(it) => it.doc_comment_text(),
ast::ConstDef(it) => { it.doc_comment_text() }, ast::ConstDef(it) => it.doc_comment_text(),
ast::StaticDef(it) => { it.doc_comment_text() }, ast::StaticDef(it) => it.doc_comment_text(),
ast::RecordFieldDef(it) => { it.doc_comment_text() }, ast::RecordFieldDef(it) => it.doc_comment_text(),
ast::EnumVariant(it) => { it.doc_comment_text() }, ast::EnumVariant(it) => it.doc_comment_text(),
ast::MacroCall(it) => { it.doc_comment_text() }, ast::MacroCall(it) => it.doc_comment_text(),
_ => None, _ => None,
} }
} }
@ -424,16 +424,16 @@ pub(crate) fn description_from_symbol(db: &RootDatabase, symbol: &FileSymbol) ->
match_ast! { match_ast! {
match node { match node {
ast::FnDef(it) => { it.short_label() }, ast::FnDef(it) => it.short_label(),
ast::StructDef(it) => { it.short_label() }, ast::StructDef(it) => it.short_label(),
ast::EnumDef(it) => { it.short_label() }, ast::EnumDef(it) => it.short_label(),
ast::TraitDef(it) => { it.short_label() }, ast::TraitDef(it) => it.short_label(),
ast::Module(it) => { it.short_label() }, ast::Module(it) => it.short_label(),
ast::TypeAliasDef(it) => { it.short_label() }, ast::TypeAliasDef(it) => it.short_label(),
ast::ConstDef(it) => { it.short_label() }, ast::ConstDef(it) => it.short_label(),
ast::StaticDef(it) => { it.short_label() }, ast::StaticDef(it) => it.short_label(),
ast::RecordFieldDef(it) => { it.short_label() }, ast::RecordFieldDef(it) => it.short_label(),
ast::EnumVariant(it) => { it.short_label() }, ast::EnumVariant(it) => it.short_label(),
_ => None, _ => None,
} }
} }

16
crates/ra_ide/src/display/structure.rs
View file

@ -117,18 +117,18 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
decl_with_detail(it, Some(detail)) decl_with_detail(it, Some(detail))
}, },
ast::StructDef(it) => { decl(it) }, ast::StructDef(it) => decl(it),
ast::EnumDef(it) => { decl(it) }, ast::EnumDef(it) => decl(it),
ast::EnumVariant(it) => { decl(it) }, ast::EnumVariant(it) => decl(it),
ast::TraitDef(it) => { decl(it) }, ast::TraitDef(it) => decl(it),
ast::Module(it) => { decl(it) }, ast::Module(it) => decl(it),
ast::TypeAliasDef(it) => { ast::TypeAliasDef(it) => {
let ty = it.type_ref(); let ty = it.type_ref();
decl_with_type_ref(it, ty) decl_with_type_ref(it, ty)
}, },
ast::RecordFieldDef(it) => { decl_with_ascription(it) }, ast::RecordFieldDef(it) => decl_with_ascription(it),
ast::ConstDef(it) => { decl_with_ascription(it) }, ast::ConstDef(it) => decl_with_ascription(it),
ast::StaticDef(it) => { decl_with_ascription(it) }, ast::StaticDef(it) => decl_with_ascription(it),
ast::ImplDef(it) => { ast::ImplDef(it) => {
let target_type = it.target_type()?; let target_type = it.target_type()?;
let target_trait = it.target_trait(); let target_trait = it.target_trait();

6
crates/ra_ide/src/goto_type_definition.rs
View file

@ -18,9 +18,9 @@ pub(crate) fn goto_type_definition(
let (ty, node) = sema.ancestors_with_macros(token.parent()).find_map(|node| { let (ty, node) = sema.ancestors_with_macros(token.parent()).find_map(|node| {
let ty = match_ast! { let ty = match_ast! {
match node { match node {
ast::Expr(expr) => { sema.type_of_expr(&expr)? }, ast::Expr(expr) => sema.type_of_expr(&expr)?,
ast::Pat(pat) => { sema.type_of_pat(&pat)? }, ast::Pat(pat) => sema.type_of_pat(&pat)?,
_ => { return None }, _ => return None,
} }
}; };

4
crates/ra_ide/src/runnables.rs
View file

@ -49,8 +49,8 @@ pub(crate) fn runnables(db: &RootDatabase, file_id: FileId) -> Vec<Runnable> {
fn runnable(sema: &Semantics<RootDatabase>, item: SyntaxNode) -> Option<Runnable> { fn runnable(sema: &Semantics<RootDatabase>, item: SyntaxNode) -> Option<Runnable> {
match_ast! { match_ast! {
match item { match item {
ast::FnDef(it) => { runnable_fn(sema, it) }, ast::FnDef(it) => runnable_fn(sema, it),
ast::Module(it) => { runnable_mod(sema, it) }, ast::Module(it) => runnable_mod(sema, it),
_ => None, _ => None,
} }
} }

2
crates/ra_ide_db/src/search.rs
View file

@ -286,7 +286,7 @@ fn reference_access(def: &Definition, name_ref: &ast::NameRef) -> Option<Referen
} }
Some(ReferenceAccess::Read) Some(ReferenceAccess::Read)
}, },
_ => {None} _ => None
} }
} }
}); });

16
crates/ra_ide_db/src/symbol_index.rs
View file

@ -354,14 +354,14 @@ fn to_symbol(node: &SyntaxNode) -> Option<(SmolStr, SyntaxNodePtr, TextRange)> {
} }
match_ast! { match_ast! {
match node { match node {
ast::FnDef(it) => { decl(it) }, ast::FnDef(it) => decl(it),
ast::StructDef(it) => { decl(it) }, ast::StructDef(it) => decl(it),
ast::EnumDef(it) => { decl(it) }, ast::EnumDef(it) => decl(it),
ast::TraitDef(it) => { decl(it) }, ast::TraitDef(it) => decl(it),
ast::Module(it) => { decl(it) }, ast::Module(it) => decl(it),
ast::TypeAliasDef(it) => { decl(it) }, ast::TypeAliasDef(it) => decl(it),
ast::ConstDef(it) => { decl(it) }, ast::ConstDef(it) => decl(it),
ast::StaticDef(it) => { decl(it) }, ast::StaticDef(it) => decl(it),
ast::MacroCall(it) => { ast::MacroCall(it) => {
if it.is_macro_rules().is_some() { if it.is_macro_rules().is_some() {
decl(it) decl(it)

12
crates/ra_syntax/src/validation.rs
View file

@ -88,12 +88,12 @@ pub(crate) fn validate(root: &SyntaxNode) -> Vec<SyntaxError> {
for node in root.descendants() { for node in root.descendants() {
match_ast! { match_ast! {
match node { match node {
ast::Literal(it) => { validate_literal(it, &mut errors) }, ast::Literal(it) => validate_literal(it, &mut errors),
ast::BlockExpr(it) => { block::validate_block_expr(it, &mut errors) }, ast::BlockExpr(it) => block::validate_block_expr(it, &mut errors),
ast::FieldExpr(it) => { validate_numeric_name(it.name_ref(), &mut errors) }, ast::FieldExpr(it) => validate_numeric_name(it.name_ref(), &mut errors),
ast::RecordField(it) => { validate_numeric_name(it.name_ref(), &mut errors) }, ast::RecordField(it) => validate_numeric_name(it.name_ref(), &mut errors),
ast::Visibility(it) => { validate_visibility(it, &mut errors) }, ast::Visibility(it) => validate_visibility(it, &mut errors),
ast::RangeExpr(it) => { validate_range_expr(it, &mut errors) }, ast::RangeExpr(it) => validate_range_expr(it, &mut errors),
_ => (), _ => (),
} }
} }