aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry <[email protected]>2020-08-09 18:39:49 +0100
committerDmitry <[email protected]>2020-08-09 18:47:22 +0100
commit4c6f3f68806fe4e9a0aa873fb892407cffa352d6 (patch)
treef9e1dee5d71017ada87231bf66094f84a7513e92
parent751d0367c2de63903897570f03c9dc1a4d5eb52a (diff)
refactoring to show more clearly the import problems
-rw-r--r--crates/ra_ide/src/completion.rs10
-rw-r--r--xtask/tests/tidy.rs2
2 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_ide/src/completion.rs b/crates/ra_ide/src/completion.rs
index a537b68b1..6bde237f3 100644
--- a/crates/ra_ide/src/completion.rs
+++ b/crates/ra_ide/src/completion.rs
@@ -21,19 +21,19 @@ mod complete_trait_impl;
21mod unstable_feature_descriptor; 21mod unstable_feature_descriptor;
22use ra_ide_db::RootDatabase; 22use ra_ide_db::RootDatabase;
23 23
24#[rustfmt::skip]
25use crate::{ 24use crate::{
26 completion::{ 25 completion::{
27 completion_context::CompletionContext, 26 completion_context::CompletionContext,
28 completion_item::{CompletionKind, Completions}, 27 completion_item::{CompletionKind, Completions},
29
30 //TODO: cyclic imports caused by xtask generation, this should be better
31 unstable_feature_descriptor::UNSTABLE_FEATURE_DESCRIPTOR,
32 complete_attribute::LintCompletion,
33 }, 28 },
34 FilePosition, 29 FilePosition,
35}; 30};
36 31
32//TODO: cyclic imports caused by xtask generation, this should be better
33use crate::completion::{
34 complete_attribute::LintCompletion, unstable_feature_descriptor::UNSTABLE_FEATURE_DESCRIPTOR,
35};
36
37pub use crate::completion::{ 37pub use crate::completion::{
38 completion_config::CompletionConfig, 38 completion_config::CompletionConfig,
39 completion_item::{CompletionItem, CompletionItemKind, CompletionScore, InsertTextFormat}, 39 completion_item::{CompletionItem, CompletionItemKind, CompletionScore, InsertTextFormat},
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
index 15a93b7a2..68a70da9e 100644
--- a/xtask/tests/tidy.rs
+++ b/xtask/tests/tidy.rs
@@ -98,7 +98,7 @@ fn check_todo(path: &Path, text: &str) {
98 // `ast::make`. 98 // `ast::make`.
99 "ast/make.rs", 99 "ast/make.rs",
100 // The documentation in string literals may contain anything for its own purposes 100 // The documentation in string literals may contain anything for its own purposes
101 "/completion/unstable_feature_descriptor.rs" 101 "completion/unstable_feature_descriptor.rs",
102 ]; 102 ];
103 if need_todo.iter().any(|p| path.ends_with(p)) { 103 if need_todo.iter().any(|p| path.ends_with(p)) {
104 return; 104 return;