From 050c69c19dd8004c8dfc92dbff86a42fac022e6e Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Sat, 24 Apr 2021 13:31:16 +0200 Subject: Split out merge_imports module from helpers::insert_use --- crates/ide_assists/src/handlers/merge_imports.rs | 2 +- crates/ide_assists/src/tests.rs | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'crates/ide_assists') 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 @@ -use ide_db::helpers::insert_use::{try_merge_imports, try_merge_trees, MergeBehavior}; +use ide_db::helpers::merge_imports::{try_merge_imports, try_merge_trees, MergeBehavior}; use syntax::{algo::neighbor, ast, ted, AstNode}; 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; use hir::Semantics; use ide_db::{ base_db::{fixture::WithFixture, FileId, FileRange, SourceDatabaseExt}, - helpers::{ - insert_use::{InsertUseConfig, MergeBehavior}, - SnippetCap, - }, + helpers::{insert_use::InsertUseConfig, merge_imports::MergeBehavior, SnippetCap}, source_change::FileSystemEdit, RootDatabase, }; -- cgit v1.2.3