diff options
Diffstat (limited to 'crates/ra_hir_def')
-rw-r--r-- | crates/ra_hir_def/src/attr.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/body.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/nameres/collector.rs | 2 |
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 | ||
3 | use std::{ops, sync::Arc}; | 3 | use std::{ops, sync::Arc}; |
4 | 4 | ||
5 | use cfg::{CfgExpr, CfgOptions}; | ||
5 | use either::Either; | 6 | use either::Either; |
6 | use hir_expand::{hygiene::Hygiene, AstId, InFile}; | 7 | use hir_expand::{hygiene::Hygiene, AstId, InFile}; |
7 | use mbe::ast_to_token_tree; | 8 | use mbe::ast_to_token_tree; |
8 | use cfg::{CfgExpr, CfgOptions}; | ||
9 | use syntax::{ | 9 | use 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; | |||
6 | use std::{mem, ops::Index, sync::Arc}; | 6 | use std::{mem, ops::Index, sync::Arc}; |
7 | 7 | ||
8 | use arena::{map::ArenaMap, Arena}; | 8 | use arena::{map::ArenaMap, Arena}; |
9 | use cfg::CfgOptions; | ||
9 | use drop_bomb::DropBomb; | 10 | use drop_bomb::DropBomb; |
10 | use either::Either; | 11 | use either::Either; |
11 | use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, AstId, HirFileId, InFile, MacroDefId}; | 12 | use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, AstId, HirFileId, InFile, MacroDefId}; |
12 | use cfg::CfgOptions; | ||
13 | use ra_db::CrateId; | 13 | use ra_db::CrateId; |
14 | use rustc_hash::FxHashMap; | 14 | use rustc_hash::FxHashMap; |
15 | use syntax::{ast, AstNode, AstPtr}; | 15 | use 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 | ||
6 | use cfg::CfgOptions; | ||
6 | use hir_expand::{ | 7 | use 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 | }; |
14 | use cfg::CfgOptions; | ||
15 | use ra_db::{CrateId, FileId, ProcMacroId}; | 15 | use ra_db::{CrateId, FileId, ProcMacroId}; |
16 | use rustc_hash::FxHashMap; | 16 | use rustc_hash::FxHashMap; |
17 | use syntax::ast; | 17 | use syntax::ast; |