From b602c73911864a86c94d8b306648738f5f995167 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 9 Aug 2020 23:55:45 +0700 Subject: [PATCH] fixes --- crates/ra_ide/src/completion.rs | 10 +++++----- xtask/src/codegen/gen_unstable_future_descriptor.rs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/ra_ide/src/completion.rs b/crates/ra_ide/src/completion.rs index a537b68b1f1..9c33a5a43bb 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 75b603d7df5..12b68378e25 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()?; - //TODO: check git, and do pull + //FIXME: check git, and do pull let src_dir = path.join("src/doc/unstable-book/src"); let files = WalkDir::new(src_dir.join("language-features"))