diff options
author | Edwin Cheng <[email protected]> | 2021-03-22 05:39:13 +0000 |
---|---|---|
committer | Edwin Cheng <[email protected]> | 2021-03-22 05:39:13 +0000 |
commit | 7784cadc3dc5b669e88ca3743b6c4225a6b6213b (patch) | |
tree | 95c847b88d9af10aea4bf1312c4b90d6b9174dbc | |
parent | 858ad554374a8b1ad67692558a0878391abfdd86 (diff) |
Reexport PrefixKind to remove deps to hir
-rw-r--r-- | crates/ide_db/src/helpers/insert_use.rs | 4 | ||||
-rw-r--r-- | crates/rust-analyzer/src/config.rs | 3 | ||||
-rw-r--r-- | crates/rust-analyzer/src/to_proto.rs | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/crates/ide_db/src/helpers/insert_use.rs b/crates/ide_db/src/helpers/insert_use.rs index 9e0cb91c3..37acf95f0 100644 --- a/crates/ide_db/src/helpers/insert_use.rs +++ b/crates/ide_db/src/helpers/insert_use.rs | |||
@@ -14,10 +14,12 @@ use syntax::{ | |||
14 | AstToken, InsertPosition, NodeOrToken, SyntaxElement, SyntaxNode, SyntaxToken, | 14 | AstToken, InsertPosition, NodeOrToken, SyntaxElement, SyntaxNode, SyntaxToken, |
15 | }; | 15 | }; |
16 | 16 | ||
17 | pub use hir::PrefixKind; | ||
18 | |||
17 | #[derive(Clone, Copy, Debug, PartialEq, Eq)] | 19 | #[derive(Clone, Copy, Debug, PartialEq, Eq)] |
18 | pub struct InsertUseConfig { | 20 | pub struct InsertUseConfig { |
19 | pub merge: Option<MergeBehavior>, | 21 | pub merge: Option<MergeBehavior>, |
20 | pub prefix_kind: hir::PrefixKind, | 22 | pub prefix_kind: PrefixKind, |
21 | pub group: bool, | 23 | pub group: bool, |
22 | } | 24 | } |
23 | 25 | ||
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 8f541976e..5c88c3a9b 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs | |||
@@ -10,10 +10,9 @@ | |||
10 | use std::{ffi::OsString, iter, path::PathBuf}; | 10 | use std::{ffi::OsString, iter, path::PathBuf}; |
11 | 11 | ||
12 | use flycheck::FlycheckConfig; | 12 | use flycheck::FlycheckConfig; |
13 | use hir::PrefixKind; | ||
14 | use ide::{AssistConfig, CompletionConfig, DiagnosticsConfig, HoverConfig, InlayHintsConfig}; | 13 | use ide::{AssistConfig, CompletionConfig, DiagnosticsConfig, HoverConfig, InlayHintsConfig}; |
15 | use ide_db::helpers::{ | 14 | use ide_db::helpers::{ |
16 | insert_use::{InsertUseConfig, MergeBehavior}, | 15 | insert_use::{InsertUseConfig, MergeBehavior, PrefixKind}, |
17 | SnippetCap, | 16 | SnippetCap, |
18 | }; | 17 | }; |
19 | use lsp_types::{ClientCapabilities, MarkupKind}; | 18 | use lsp_types::{ClientCapabilities, MarkupKind}; |
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index 1ddea9278..c1ca7ff9b 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs | |||
@@ -1073,9 +1073,11 @@ pub(crate) fn rename_error(err: RenameError) -> crate::LspError { | |||
1073 | mod tests { | 1073 | mod tests { |
1074 | use std::sync::Arc; | 1074 | use std::sync::Arc; |
1075 | 1075 | ||
1076 | use hir::PrefixKind; | ||
1077 | use ide::Analysis; | 1076 | use ide::Analysis; |
1078 | use ide_db::helpers::{insert_use::InsertUseConfig, SnippetCap}; | 1077 | use ide_db::helpers::{ |
1078 | insert_use::{InsertUseConfig, PrefixKind}, | ||
1079 | SnippetCap, | ||
1080 | }; | ||
1079 | 1081 | ||
1080 | use super::*; | 1082 | use super::*; |
1081 | 1083 | ||