From 19cce08662222f012a0f50ff73afd4fdd34ca683 Mon Sep 17 00:00:00 2001 From: Igor Aleksanov Date: Sat, 24 Oct 2020 11:39:57 +0300 Subject: Re-export base_db from ide_db --- crates/completion/src/complete_mod.rs | 2 +- crates/completion/src/completion_context.rs | 2 +- crates/completion/src/lib.rs | 2 +- crates/completion/src/test_utils.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/completion') diff --git a/crates/completion/src/complete_mod.rs b/crates/completion/src/complete_mod.rs index 35a57aba3..385911afa 100644 --- a/crates/completion/src/complete_mod.rs +++ b/crates/completion/src/complete_mod.rs @@ -1,7 +1,7 @@ //! Completes mod declarations. -use base_db::{SourceDatabaseExt, VfsPath}; use hir::{Module, ModuleSource}; +use ide_db::base_db::{SourceDatabaseExt, VfsPath}; use ide_db::RootDatabase; use rustc_hash::FxHashSet; diff --git a/crates/completion/src/completion_context.rs b/crates/completion/src/completion_context.rs index 97c5c04ba..dca304a8f 100644 --- a/crates/completion/src/completion_context.rs +++ b/crates/completion/src/completion_context.rs @@ -1,7 +1,7 @@ //! See `CompletionContext` structure. -use base_db::{FilePosition, SourceDatabase}; use hir::{Local, ScopeDef, Semantics, SemanticsScope, Type}; +use ide_db::base_db::{FilePosition, SourceDatabase}; use ide_db::{call_info::ActiveParameter, RootDatabase}; use syntax::{ algo::{find_covering_element, find_node_at_offset}, diff --git a/crates/completion/src/lib.rs b/crates/completion/src/lib.rs index 0a60ea7f2..b72fd249d 100644 --- a/crates/completion/src/lib.rs +++ b/crates/completion/src/lib.rs @@ -23,7 +23,7 @@ mod complete_macro_in_item_position; mod complete_trait_impl; mod complete_mod; -use base_db::FilePosition; +use ide_db::base_db::FilePosition; use ide_db::RootDatabase; use crate::{ diff --git a/crates/completion/src/test_utils.rs b/crates/completion/src/test_utils.rs index f2cf2561f..b02556797 100644 --- a/crates/completion/src/test_utils.rs +++ b/crates/completion/src/test_utils.rs @@ -1,7 +1,7 @@ //! Runs completion for testing purposes. -use base_db::{fixture::ChangeFixture, FileLoader, FilePosition}; use hir::Semantics; +use ide_db::base_db::{fixture::ChangeFixture, FileLoader, FilePosition}; use ide_db::RootDatabase; use itertools::Itertools; use stdx::{format_to, trim_indent}; -- cgit v1.2.3