Skip to content

Commit 3fb6a3b

Browse files
committed
Remove un needed extra handling for remove self with braces
1 parent ce0239b commit 3fb6a3b

File tree

1 file changed

+5
-17
lines changed

1 file changed

+5
-17
lines changed

crates/ide-diagnostics/src/handlers/useless_braces.rs

+5-17
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,11 @@ pub(crate) fn useless_braces(
2727
}
2828

2929
let use_range = use_tree_list.syntax().text_range();
30-
let edit = remove_braces(&single_use_tree).unwrap_or_else(|| {
31-
let to_replace = single_use_tree.syntax().text().to_string();
32-
let mut edit_builder = TextEdit::builder();
33-
edit_builder.delete(use_range);
34-
edit_builder.insert(use_range.start(), to_replace);
35-
edit_builder.finish()
36-
});
30+
let to_replace = single_use_tree.syntax().text().to_string();
31+
let mut edit_builder = TextEdit::builder();
32+
edit_builder.delete(use_range);
33+
edit_builder.insert(use_range.start(), to_replace);
34+
let edit = edit_builder.finish();
3735

3836
acc.push(
3937
Diagnostic::new(
@@ -53,16 +51,6 @@ pub(crate) fn useless_braces(
5351
Some(())
5452
}
5553

56-
fn remove_braces(single_use_tree: &ast::UseTree) -> Option<TextEdit> {
57-
let use_tree_list_node = single_use_tree.syntax().parent()?;
58-
if single_use_tree.path()?.segment()?.self_token().is_some() {
59-
let start = use_tree_list_node.prev_sibling_or_token()?.text_range().start();
60-
let end = use_tree_list_node.text_range().end();
61-
return Some(TextEdit::delete(TextRange::new(start, end)));
62-
}
63-
None
64-
}
65-
6654
#[cfg(test)]
6755
mod tests {
6856
use crate::tests::{check_diagnostics, check_fix};

0 commit comments

Comments
 (0)