diff --git a/crates/ra_ide/src/completion.rs b/crates/ra_ide/src/completion.rs
index 9c33a5a43b..a537b68b1f 100644
--- a/crates/ra_ide/src/completion.rs
+++ b/crates/ra_ide/src/completion.rs
@@ -21,19 +21,19 @@ mod complete_trait_impl;
 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},
diff --git a/xtask/src/codegen/gen_unstable_future_descriptor.rs b/xtask/src/codegen/gen_unstable_future_descriptor.rs
index 122b91c069..84849d3d5e 100644
--- a/xtask/src/codegen/gen_unstable_future_descriptor.rs
+++ b/xtask/src/codegen/gen_unstable_future_descriptor.rs
@@ -21,7 +21,7 @@ pub fn generate_unstable_future_descriptor(mode: Mode) -> Result<()> {
         .args(&["sparse-checkout", "set", "/src/doc/unstable-book/src/"])
         .output()?;
     Command::new("git").current_dir(path.clone()).args(&["pull", "origin", "master"]).output()?;
-    //FIXME: check git, and do pull
+    //TODO: check git, and do pull
 
     let src_dir = path.join("src/doc/unstable-book/src");
     let files = WalkDir::new(src_dir.join("language-features"))