diff options
author | Lukas Wirth <[email protected]> | 2021-04-24 12:31:16 +0100 |
---|---|---|
committer | Lukas Wirth <[email protected]> | 2021-04-24 12:31:43 +0100 |
commit | 050c69c19dd8004c8dfc92dbff86a42fac022e6e (patch) | |
tree | 558c6d18d829a5a0b954654df5b232772839c86f /crates/ide_assists | |
parent | 4d110dd118e42a355ca8db41c7fdbf4371c45105 (diff) |
Split out merge_imports module from helpers::insert_use
Diffstat (limited to 'crates/ide_assists')
-rw-r--r-- | crates/ide_assists/src/handlers/merge_imports.rs | 2 | ||||
-rw-r--r-- | crates/ide_assists/src/tests.rs | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/crates/ide_assists/src/handlers/merge_imports.rs b/crates/ide_assists/src/handlers/merge_imports.rs index 8e0794218..add7b8e37 100644 --- a/crates/ide_assists/src/handlers/merge_imports.rs +++ b/crates/ide_assists/src/handlers/merge_imports.rs | |||
@@ -1,4 +1,4 @@ | |||
1 | use ide_db::helpers::insert_use::{try_merge_imports, try_merge_trees, MergeBehavior}; | 1 | use ide_db::helpers::merge_imports::{try_merge_imports, try_merge_trees, MergeBehavior}; |
2 | use syntax::{algo::neighbor, ast, ted, AstNode}; | 2 | use syntax::{algo::neighbor, ast, ted, AstNode}; |
3 | 3 | ||
4 | use crate::{ | 4 | use crate::{ |
diff --git a/crates/ide_assists/src/tests.rs b/crates/ide_assists/src/tests.rs index 49533e7d2..6f4f97361 100644 --- a/crates/ide_assists/src/tests.rs +++ b/crates/ide_assists/src/tests.rs | |||
@@ -4,10 +4,7 @@ use expect_test::expect; | |||
4 | use hir::Semantics; | 4 | use hir::Semantics; |
5 | use ide_db::{ | 5 | use ide_db::{ |
6 | base_db::{fixture::WithFixture, FileId, FileRange, SourceDatabaseExt}, | 6 | base_db::{fixture::WithFixture, FileId, FileRange, SourceDatabaseExt}, |
7 | helpers::{ | 7 | helpers::{insert_use::InsertUseConfig, merge_imports::MergeBehavior, SnippetCap}, |
8 | insert_use::{InsertUseConfig, MergeBehavior}, | ||
9 | SnippetCap, | ||
10 | }, | ||
11 | source_change::FileSystemEdit, | 8 | source_change::FileSystemEdit, |
12 | RootDatabase, | 9 | RootDatabase, |
13 | }; | 10 | }; |