refactoring to show more clearly the import problems

crates/ra_ide/src/completion.rs

@@ -21,19 +21,19 @@
 mod unstable_feature_descriptor;
 use ra_ide_db::RootDatabase;
 
-#[rustfmt::skip]
 use crate::{
     completion::{
         completion_context::CompletionContext,
         completion_item::{CompletionKind, Completions},
-
-        //TODO: cyclic imports caused by xtask generation, this should be better
-        unstable_feature_descriptor::UNSTABLE_FEATURE_DESCRIPTOR,
-        complete_attribute::LintCompletion,
     },
     FilePosition,
 };
 
+//FIXME: cyclic imports caused by xtask generation, this should be better
+use crate::completion::{
+    complete_attribute::LintCompletion, unstable_feature_descriptor::UNSTABLE_FEATURE_DESCRIPTOR,
+};
+
 pub use crate::completion::{
     completion_config::CompletionConfig,
     completion_item::{CompletionItem, CompletionItemKind, CompletionScore, InsertTextFormat},

xtask/tests/tidy.rs

@@ -98,7 +98,7 @@ fn check_todo(path: &Path, text: &str) {
         // `ast::make`.
         "ast/make.rs",
         // The documentation in string literals may contain anything for its own purposes
-        "/completion/unstable_feature_descriptor.rs"
+        "completion/unstable_feature_descriptor.rs",
     ];
     if need_todo.iter().any(|p| path.ends_with(p)) {
         return;