aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crates/ra_ide/src/completion.rs10
-rw-r--r--xtask/src/codegen/gen_unstable_future_descriptor.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 9c33a5a43..a537b68b1 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]
24use crate::{ 25use crate::{
25 completion::{ 26 completion::{
26 completion_context::CompletionContext, 27 completion_context::CompletionContext,
27 completion_item::{CompletionKind, Completions}, 28 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,
28 }, 33 },
29 FilePosition, 34 FilePosition,
30}; 35};
31 36
32//FIXME: 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/src/codegen/gen_unstable_future_descriptor.rs b/xtask/src/codegen/gen_unstable_future_descriptor.rs
index 122b91c06..84849d3d5 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<()> {
21 .args(&["sparse-checkout", "set", "/src/doc/unstable-book/src/"]) 21 .args(&["sparse-checkout", "set", "/src/doc/unstable-book/src/"])
22 .output()?; 22 .output()?;
23 Command::new("git").current_dir(path.clone()).args(&["pull", "origin", "master"]).output()?; 23 Command::new("git").current_dir(path.clone()).args(&["pull", "origin", "master"]).output()?;
24 //FIXME: check git, and do pull 24 //TODO: check git, and do pull
25 25
26 let src_dir = path.join("src/doc/unstable-book/src"); 26 let src_dir = path.join("src/doc/unstable-book/src");
27 let files = WalkDir::new(src_dir.join("language-features")) 27 let files = WalkDir::new(src_dir.join("language-features"))