diff options
| author | Aleksey Kladov <[email protected]> | 2021-05-16 12:18:49 +0100 |
|---|---|---|
| committer | Aleksey Kladov <[email protected]> | 2021-05-16 12:18:49 +0100 |
| commit | 4e142757e167ac16ce65ba1c743e131aba83cdc4 (patch) | |
| tree | 9d4e1061420b06c658ecbcf8c61b4acf98b31b7b /crates/ide_assists/src/handlers/merge_imports.rs | |
| parent | a57bd59f351600c408ef9d2a4df3f2c10e817d0d (diff) | |
minor: use uniform names
Diffstat (limited to 'crates/ide_assists/src/handlers/merge_imports.rs')
| -rw-r--r-- | crates/ide_assists/src/handlers/merge_imports.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ide_assists/src/handlers/merge_imports.rs b/crates/ide_assists/src/handlers/merge_imports.rs index 3cd090737..31854840c 100644 --- a/crates/ide_assists/src/handlers/merge_imports.rs +++ b/crates/ide_assists/src/handlers/merge_imports.rs | |||
| @@ -47,16 +47,16 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() | |||
| 47 | target, | 47 | target, |
| 48 | |builder| { | 48 | |builder| { |
| 49 | if let Some((to_replace, replacement, to_remove)) = imports { | 49 | if let Some((to_replace, replacement, to_remove)) = imports { |
| 50 | let to_replace = builder.make_ast_mut(to_replace); | 50 | let to_replace = builder.make_mut(to_replace); |
| 51 | let to_remove = builder.make_ast_mut(to_remove); | 51 | let to_remove = builder.make_mut(to_remove); |
| 52 | 52 | ||
| 53 | ted::replace(to_replace.syntax(), replacement.syntax()); | 53 | ted::replace(to_replace.syntax(), replacement.syntax()); |
| 54 | to_remove.remove(); | 54 | to_remove.remove(); |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | if let Some((to_replace, replacement, to_remove)) = uses { | 57 | if let Some((to_replace, replacement, to_remove)) = uses { |
| 58 | let to_replace = builder.make_ast_mut(to_replace); | 58 | let to_replace = builder.make_mut(to_replace); |
| 59 | let to_remove = builder.make_ast_mut(to_remove); | 59 | let to_remove = builder.make_mut(to_remove); |
| 60 | 60 | ||
| 61 | ted::replace(to_replace.syntax(), replacement.syntax()); | 61 | ted::replace(to_replace.syntax(), replacement.syntax()); |
| 62 | to_remove.remove() | 62 | to_remove.remove() |