about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmrDeveloper <amr96@programmer.net>2023-07-05 17:38:58 +0200
committerAmrDeveloper <amr96@programmer.net>2023-07-05 17:38:58 +0200
commit3fb6a3be8242cfd57d891c4b6a666e3e9e38c01d (patch)
treec5c79816805c3a941400d5301f83bbaf361b808e
parentce0239bd6a58ce5326b7480c8bdd8552d111a46f (diff)
downloadrust-3fb6a3be8242cfd57d891c4b6a666e3e9e38c01d.tar.gz
rust-3fb6a3be8242cfd57d891c4b6a666e3e9e38c01d.zip
Remove un needed extra handling for remove self with braces
-rw-r--r--crates/ide-diagnostics/src/handlers/useless_braces.rs22
1 files changed, 5 insertions, 17 deletions
diff --git a/crates/ide-diagnostics/src/handlers/useless_braces.rs b/crates/ide-diagnostics/src/handlers/useless_braces.rs
index 49cdcdb00f0..79dd09378ca 100644
--- a/crates/ide-diagnostics/src/handlers/useless_braces.rs
+++ b/crates/ide-diagnostics/src/handlers/useless_braces.rs
@@ -27,13 +27,11 @@ pub(crate) fn useless_braces(
         }
 
         let use_range = use_tree_list.syntax().text_range();
-        let edit = remove_braces(&single_use_tree).unwrap_or_else(|| {
-            let to_replace = single_use_tree.syntax().text().to_string();
-            let mut edit_builder = TextEdit::builder();
-            edit_builder.delete(use_range);
-            edit_builder.insert(use_range.start(), to_replace);
-            edit_builder.finish()
-        });
+        let to_replace = single_use_tree.syntax().text().to_string();
+        let mut edit_builder = TextEdit::builder();
+        edit_builder.delete(use_range);
+        edit_builder.insert(use_range.start(), to_replace);
+        let edit = edit_builder.finish();
 
         acc.push(
             Diagnostic::new(
@@ -53,16 +51,6 @@ pub(crate) fn useless_braces(
     Some(())
 }
 
-fn remove_braces(single_use_tree: &ast::UseTree) -> Option<TextEdit> {
-    let use_tree_list_node = single_use_tree.syntax().parent()?;
-    if single_use_tree.path()?.segment()?.self_token().is_some() {
-        let start = use_tree_list_node.prev_sibling_or_token()?.text_range().start();
-        let end = use_tree_list_node.text_range().end();
-        return Some(TextEdit::delete(TextRange::new(start, end)));
-    }
-    None
-}
-
 #[cfg(test)]
 mod tests {
     use crate::tests::{check_diagnostics, check_fix};