mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-08-19 01:50:32 +00:00
return value directly from if/else block
This commit is contained in:
parent
4f8ffd0ba4
commit
0a0817905e
2 changed files with 9 additions and 8 deletions
|
@ -118,13 +118,13 @@ pub(crate) fn extract_module(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opti
|
||||||
|
|
||||||
let mut body_items: Vec<String> = Vec::new();
|
let mut body_items: Vec<String> = Vec::new();
|
||||||
let mut items_to_be_processed: Vec<ast::Item> = module.body_items.clone();
|
let mut items_to_be_processed: Vec<ast::Item> = module.body_items.clone();
|
||||||
let mut new_item_indent = old_item_indent + 1;
|
|
||||||
|
|
||||||
if impl_parent.is_some() {
|
let new_item_indent = if impl_parent.is_some() {
|
||||||
new_item_indent = old_item_indent + 2;
|
old_item_indent + 2
|
||||||
} else {
|
} else {
|
||||||
items_to_be_processed = [module.use_items.clone(), items_to_be_processed].concat();
|
items_to_be_processed = [module.use_items.clone(), items_to_be_processed].concat();
|
||||||
}
|
old_item_indent + 1
|
||||||
|
};
|
||||||
|
|
||||||
for item in items_to_be_processed {
|
for item in items_to_be_processed {
|
||||||
let item = item.indent(IndentLevel(1));
|
let item = item.indent(IndentLevel(1));
|
||||||
|
|
|
@ -83,11 +83,12 @@ fn path_segment(p: &mut Parser<'_>, mode: Mode, first: bool) {
|
||||||
}
|
}
|
||||||
p.expect(T![>]);
|
p.expect(T![>]);
|
||||||
} else {
|
} else {
|
||||||
let mut empty = true;
|
let empty = if first {
|
||||||
if first {
|
|
||||||
p.eat(T![::]);
|
p.eat(T![::]);
|
||||||
empty = false;
|
false
|
||||||
}
|
} else {
|
||||||
|
true
|
||||||
|
};
|
||||||
match p.current() {
|
match p.current() {
|
||||||
IDENT => {
|
IDENT => {
|
||||||
name_ref(p);
|
name_ref(p);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue