aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_def
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir_def')
-rw-r--r--crates/ra_hir_def/src/attr.rs2
-rw-r--r--crates/ra_hir_def/src/body.rs2
-rw-r--r--crates/ra_hir_def/src/nameres/collector.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_def/src/attr.rs b/crates/ra_hir_def/src/attr.rs
index 1e5b06ca0..dea552a60 100644
--- a/crates/ra_hir_def/src/attr.rs
+++ b/crates/ra_hir_def/src/attr.rs
@@ -2,10 +2,10 @@
2 2
3use std::{ops, sync::Arc}; 3use std::{ops, sync::Arc};
4 4
5use cfg::{CfgExpr, CfgOptions};
5use either::Either; 6use either::Either;
6use hir_expand::{hygiene::Hygiene, AstId, InFile}; 7use hir_expand::{hygiene::Hygiene, AstId, InFile};
7use mbe::ast_to_token_tree; 8use mbe::ast_to_token_tree;
8use cfg::{CfgExpr, CfgOptions};
9use syntax::{ 9use syntax::{
10 ast::{self, AstNode, AttrsOwner}, 10 ast::{self, AstNode, AttrsOwner},
11 SmolStr, 11 SmolStr,
diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs
index 3568513d1..fe659386a 100644
--- a/crates/ra_hir_def/src/body.rs
+++ b/crates/ra_hir_def/src/body.rs
@@ -6,10 +6,10 @@ pub mod scope;
6use std::{mem, ops::Index, sync::Arc}; 6use std::{mem, ops::Index, sync::Arc};
7 7
8use arena::{map::ArenaMap, Arena}; 8use arena::{map::ArenaMap, Arena};
9use cfg::CfgOptions;
9use drop_bomb::DropBomb; 10use drop_bomb::DropBomb;
10use either::Either; 11use either::Either;
11use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, AstId, HirFileId, InFile, MacroDefId}; 12use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, AstId, HirFileId, InFile, MacroDefId};
12use cfg::CfgOptions;
13use ra_db::CrateId; 13use ra_db::CrateId;
14use rustc_hash::FxHashMap; 14use rustc_hash::FxHashMap;
15use syntax::{ast, AstNode, AstPtr}; 15use syntax::{ast, AstNode, AstPtr};
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index fa2dadfc5..6a5891936 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/ra_hir_def/src/nameres/collector.rs
@@ -3,6 +3,7 @@
3//! `DefCollector::collect` contains the fixed-point iteration loop which 3//! `DefCollector::collect` contains the fixed-point iteration loop which
4//! resolves imports and expands macros. 4//! resolves imports and expands macros.
5 5
6use cfg::CfgOptions;
6use hir_expand::{ 7use hir_expand::{
7 ast_id_map::FileAstId, 8 ast_id_map::FileAstId,
8 builtin_derive::find_builtin_derive, 9 builtin_derive::find_builtin_derive,
@@ -11,7 +12,6 @@ use hir_expand::{
11 proc_macro::ProcMacroExpander, 12 proc_macro::ProcMacroExpander,
12 HirFileId, MacroCallId, MacroDefId, MacroDefKind, 13 HirFileId, MacroCallId, MacroDefId, MacroDefKind,
13}; 14};
14use cfg::CfgOptions;
15use ra_db::{CrateId, FileId, ProcMacroId}; 15use ra_db::{CrateId, FileId, ProcMacroId};
16use rustc_hash::FxHashMap; 16use rustc_hash::FxHashMap;
17use syntax::ast; 17use syntax::ast;