Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "fixes"

Browse source 
This reverts commit b602c73911.
This commit is contained in:
Dmitry 2020-08-09 23:55:45 +07:00
parent ceadcf23fe
commit fab733b3ae
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_ide/src/completion.rs
View file

@ -21,19 +21,19 @@ mod complete_trait_impl;
mod unstable_feature_descriptor; mod unstable_feature_descriptor;
use ra_ide_db::RootDatabase; use ra_ide_db::RootDatabase;
#[rustfmt::skip]
use crate::{ use crate::{
completion::{ completion::{
completion_context::CompletionContext, completion_context::CompletionContext,
completion_item::{CompletionKind, Completions}, 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, 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::{ pub use crate::completion::{
completion_config::CompletionConfig, completion_config::CompletionConfig,
completion_item::{CompletionItem, CompletionItemKind, CompletionScore, InsertTextFormat}, completion_item::{CompletionItem, CompletionItemKind, CompletionScore, InsertTextFormat},

2
xtask/src/codegen/gen_unstable_future_descriptor.rs
View file

@ -21,7 +21,7 @@ pub fn generate_unstable_future_descriptor(mode: Mode) -> Result<()> {
.args(&["sparse-checkout", "set", "/src/doc/unstable-book/src/"]) .args(&["sparse-checkout", "set", "/src/doc/unstable-book/src/"])
.output()?; .output()?;
Command::new("git").current_dir(path.clone()).args(&["pull", "origin", "master"]).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 src_dir = path.join("src/doc/unstable-book/src");
let files = WalkDir::new(src_dir.join("language-features")) let files = WalkDir::new(src_dir.join("language-features"))