This commit is contained in:
Aleksey Kladov 2020-08-13 10:32:19 +02:00
parent 68c2238725
commit 7d9480c6eb
6 changed files with 6 additions and 6 deletions

View file

@ -2,10 +2,10 @@
use std::{ops, sync::Arc};
use cfg::{CfgExpr, CfgOptions};
use either::Either;
use hir_expand::{hygiene::Hygiene, AstId, InFile};
use mbe::ast_to_token_tree;
use cfg::{CfgExpr, CfgOptions};
use syntax::{
ast::{self, AstNode, AttrsOwner},
SmolStr,

View file

@ -6,10 +6,10 @@ pub mod scope;
use std::{mem, ops::Index, sync::Arc};
use arena::{map::ArenaMap, Arena};
use cfg::CfgOptions;
use drop_bomb::DropBomb;
use either::Either;
use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, AstId, HirFileId, InFile, MacroDefId};
use cfg::CfgOptions;
use ra_db::CrateId;
use rustc_hash::FxHashMap;
use syntax::{ast, AstNode, AstPtr};

View file

@ -3,6 +3,7 @@
//! `DefCollector::collect` contains the fixed-point iteration loop which
//! resolves imports and expands macros.
use cfg::CfgOptions;
use hir_expand::{
ast_id_map::FileAstId,
builtin_derive::find_builtin_derive,
@ -11,7 +12,6 @@ use hir_expand::{
proc_macro::ProcMacroExpander,
HirFileId, MacroCallId, MacroDefId, MacroDefKind,
};
use cfg::CfgOptions;
use ra_db::{CrateId, FileId, ProcMacroId};
use rustc_hash::FxHashMap;
use syntax::ast;

View file

@ -1,8 +1,8 @@
use std::fmt;
use cfg::CfgExpr;
use hir::{AsAssocItem, Attrs, HirFileId, InFile, Semantics};
use itertools::Itertools;
use cfg::CfgExpr;
use ra_ide_db::RootDatabase;
use syntax::{
ast::{self, AstNode, AttrsOwner, DocCommentsOwner, ModuleItemOwner, NameOwner},

View file

@ -12,8 +12,8 @@ use std::{
};
use anyhow::{bail, Context, Result};
use paths::{AbsPath, AbsPathBuf};
use cfg::CfgOptions;
use paths::{AbsPath, AbsPathBuf};
use ra_db::{CrateGraph, CrateId, CrateName, Edition, Env, FileId};
use rustc_hash::{FxHashMap, FxHashSet};

View file

@ -177,8 +177,8 @@ fn required_features(cfg_expr: &CfgExpr, features: &mut Vec<String>) {
mod tests {
use super::*;
use mbe::ast_to_token_tree;
use cfg::CfgExpr;
use mbe::ast_to_token_tree;
use syntax::{
ast::{self, AstNode},
SmolStr,