diff options
Diffstat (limited to 'crates/ra_ide')
-rw-r--r-- | crates/ra_ide/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_ide/src/completion/complete_postfix.rs | 2 | ||||
-rw-r--r-- | crates/ra_ide/src/completion/complete_trait_impl.rs | 2 | ||||
-rw-r--r-- | crates/ra_ide/src/join_lines.rs | 2 | ||||
-rw-r--r-- | crates/ra_ide/src/lib.rs | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_ide/Cargo.toml b/crates/ra_ide/Cargo.toml index 8519e9cca..2eb86755f 100644 --- a/crates/ra_ide/Cargo.toml +++ b/crates/ra_ide/Cargo.toml | |||
@@ -28,7 +28,7 @@ ide_db = { path = "../ide_db" } | |||
28 | cfg = { path = "../cfg" } | 28 | cfg = { path = "../cfg" } |
29 | profile = { path = "../profile" } | 29 | profile = { path = "../profile" } |
30 | test_utils = { path = "../test_utils" } | 30 | test_utils = { path = "../test_utils" } |
31 | ra_assists = { path = "../ra_assists" } | 31 | assists = { path = "../assists" } |
32 | ssr = { path = "../ssr" } | 32 | ssr = { path = "../ssr" } |
33 | 33 | ||
34 | # ra_ide should depend only on the top-level `hir` package. if you need | 34 | # ra_ide should depend only on the top-level `hir` package. if you need |
diff --git a/crates/ra_ide/src/completion/complete_postfix.rs b/crates/ra_ide/src/completion/complete_postfix.rs index 05e15d464..d50b13c52 100644 --- a/crates/ra_ide/src/completion/complete_postfix.rs +++ b/crates/ra_ide/src/completion/complete_postfix.rs | |||
@@ -1,5 +1,5 @@ | |||
1 | //! FIXME: write short doc here | 1 | //! FIXME: write short doc here |
2 | use ra_assists::utils::TryEnum; | 2 | use assists::utils::TryEnum; |
3 | use syntax::{ | 3 | use syntax::{ |
4 | ast::{self, AstNode}, | 4 | ast::{self, AstNode}, |
5 | TextRange, TextSize, | 5 | TextRange, TextSize, |
diff --git a/crates/ra_ide/src/completion/complete_trait_impl.rs b/crates/ra_ide/src/completion/complete_trait_impl.rs index d7edd92cf..478e31262 100644 --- a/crates/ra_ide/src/completion/complete_trait_impl.rs +++ b/crates/ra_ide/src/completion/complete_trait_impl.rs | |||
@@ -31,8 +31,8 @@ | |||
31 | //! } | 31 | //! } |
32 | //! ``` | 32 | //! ``` |
33 | 33 | ||
34 | use assists::utils::get_missing_assoc_items; | ||
34 | use hir::{self, Docs, HasSource}; | 35 | use hir::{self, Docs, HasSource}; |
35 | use ra_assists::utils::get_missing_assoc_items; | ||
36 | use syntax::{ | 36 | use syntax::{ |
37 | ast::{self, edit, Impl}, | 37 | ast::{self, edit, Impl}, |
38 | AstNode, SyntaxKind, SyntaxNode, TextRange, T, | 38 | AstNode, SyntaxKind, SyntaxNode, TextRange, T, |
diff --git a/crates/ra_ide/src/join_lines.rs b/crates/ra_ide/src/join_lines.rs index f5c310701..e37702acd 100644 --- a/crates/ra_ide/src/join_lines.rs +++ b/crates/ra_ide/src/join_lines.rs | |||
@@ -1,5 +1,5 @@ | |||
1 | use assists::utils::extract_trivial_expression; | ||
1 | use itertools::Itertools; | 2 | use itertools::Itertools; |
2 | use ra_assists::utils::extract_trivial_expression; | ||
3 | use syntax::{ | 3 | use syntax::{ |
4 | algo::{find_covering_element, non_trivia_sibling}, | 4 | algo::{find_covering_element, non_trivia_sibling}, |
5 | ast::{self, AstNode, AstToken}, | 5 | ast::{self, AstNode, AstToken}, |
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs index bbc9e4b8a..4321a6b74 100644 --- a/crates/ra_ide/src/lib.rs +++ b/crates/ra_ide/src/lib.rs | |||
@@ -80,6 +80,7 @@ pub use crate::{ | |||
80 | }, | 80 | }, |
81 | }; | 81 | }; |
82 | 82 | ||
83 | pub use assists::{Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist}; | ||
83 | pub use base_db::{ | 84 | pub use base_db::{ |
84 | Canceled, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRoot, | 85 | Canceled, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRoot, |
85 | SourceRootId, | 86 | SourceRootId, |
@@ -93,7 +94,6 @@ pub use ide_db::{ | |||
93 | symbol_index::Query, | 94 | symbol_index::Query, |
94 | RootDatabase, | 95 | RootDatabase, |
95 | }; | 96 | }; |
96 | pub use ra_assists::{Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist}; | ||
97 | pub use ssr::SsrError; | 97 | pub use ssr::SsrError; |
98 | pub use text_edit::{Indel, TextEdit}; | 98 | pub use text_edit::{Indel, TextEdit}; |
99 | 99 | ||
@@ -478,7 +478,7 @@ impl Analysis { | |||
478 | config: &AssistConfig, | 478 | config: &AssistConfig, |
479 | frange: FileRange, | 479 | frange: FileRange, |
480 | ) -> Cancelable<Vec<ResolvedAssist>> { | 480 | ) -> Cancelable<Vec<ResolvedAssist>> { |
481 | self.with_db(|db| ra_assists::Assist::resolved(db, config, frange)) | 481 | self.with_db(|db| assists::Assist::resolved(db, config, frange)) |
482 | } | 482 | } |
483 | 483 | ||
484 | /// Computes unresolved assists (aka code actions aka intentions) for the given | 484 | /// Computes unresolved assists (aka code actions aka intentions) for the given |