diff options
author | Jonas Schievink <[email protected]> | 2020-06-05 12:15:16 +0100 |
---|---|---|
committer | Jonas Schievink <[email protected]> | 2020-06-05 12:15:16 +0100 |
commit | 8395396782e343c6fe6bd318c74e8c9884b22323 (patch) | |
tree | ec894453671cca713083ec0e898ac22375542bd0 /crates/ra_hir_def | |
parent | 5f23f8ca449e456087d0657f925837bfb1a3f5ec (diff) |
Reorder imports
Diffstat (limited to 'crates/ra_hir_def')
-rw-r--r-- | crates/ra_hir_def/src/find_path.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/import_map.rs | 8 | ||||
-rw-r--r-- | crates/ra_hir_def/src/item_scope.rs | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/crates/ra_hir_def/src/find_path.rs b/crates/ra_hir_def/src/find_path.rs index d6ae970dc..a7f59e028 100644 --- a/crates/ra_hir_def/src/find_path.rs +++ b/crates/ra_hir_def/src/find_path.rs | |||
@@ -2,6 +2,7 @@ | |||
2 | 2 | ||
3 | use hir_expand::name::{known, AsName, Name}; | 3 | use hir_expand::name::{known, AsName, Name}; |
4 | use ra_prof::profile; | 4 | use ra_prof::profile; |
5 | use rustc_hash::FxHashSet; | ||
5 | use test_utils::mark; | 6 | use test_utils::mark; |
6 | 7 | ||
7 | use crate::{ | 8 | use crate::{ |
@@ -11,7 +12,6 @@ use crate::{ | |||
11 | visibility::Visibility, | 12 | visibility::Visibility, |
12 | ModuleDefId, ModuleId, | 13 | ModuleDefId, ModuleId, |
13 | }; | 14 | }; |
14 | use rustc_hash::FxHashSet; | ||
15 | 15 | ||
16 | // FIXME: handle local items | 16 | // FIXME: handle local items |
17 | 17 | ||
diff --git a/crates/ra_hir_def/src/import_map.rs b/crates/ra_hir_def/src/import_map.rs index 7c8c4b6cb..1c812a19a 100644 --- a/crates/ra_hir_def/src/import_map.rs +++ b/crates/ra_hir_def/src/import_map.rs | |||
@@ -1,5 +1,10 @@ | |||
1 | //! A map of all publicly exported items in a crate. | 1 | //! A map of all publicly exported items in a crate. |
2 | 2 | ||
3 | use std::{collections::hash_map::Entry, sync::Arc}; | ||
4 | |||
5 | use ra_db::CrateId; | ||
6 | use rustc_hash::FxHashMap; | ||
7 | |||
3 | use crate::{ | 8 | use crate::{ |
4 | db::DefDatabase, | 9 | db::DefDatabase, |
5 | item_scope::ItemInNs, | 10 | item_scope::ItemInNs, |
@@ -7,9 +12,6 @@ use crate::{ | |||
7 | visibility::Visibility, | 12 | visibility::Visibility, |
8 | ModuleDefId, ModuleId, | 13 | ModuleDefId, ModuleId, |
9 | }; | 14 | }; |
10 | use ra_db::CrateId; | ||
11 | use rustc_hash::FxHashMap; | ||
12 | use std::{collections::hash_map::Entry, sync::Arc}; | ||
13 | 15 | ||
14 | /// A map from publicly exported items to the path needed to import/name them from a downstream | 16 | /// A map from publicly exported items to the path needed to import/name them from a downstream |
15 | /// crate. | 17 | /// crate. |
diff --git a/crates/ra_hir_def/src/item_scope.rs b/crates/ra_hir_def/src/item_scope.rs index d340e1f13..b03ba939a 100644 --- a/crates/ra_hir_def/src/item_scope.rs +++ b/crates/ra_hir_def/src/item_scope.rs | |||
@@ -3,13 +3,13 @@ | |||
3 | 3 | ||
4 | use hir_expand::name::Name; | 4 | use hir_expand::name::Name; |
5 | use once_cell::sync::Lazy; | 5 | use once_cell::sync::Lazy; |
6 | use ra_db::CrateId; | ||
6 | use rustc_hash::FxHashMap; | 7 | use rustc_hash::FxHashMap; |
7 | 8 | ||
8 | use crate::{ | 9 | use crate::{ |
9 | db::DefDatabase, per_ns::PerNs, visibility::Visibility, AdtId, BuiltinType, HasModule, ImplId, | 10 | db::DefDatabase, per_ns::PerNs, visibility::Visibility, AdtId, BuiltinType, HasModule, ImplId, |
10 | Lookup, MacroDefId, ModuleDefId, TraitId, | 11 | Lookup, MacroDefId, ModuleDefId, TraitId, |
11 | }; | 12 | }; |
12 | use ra_db::CrateId; | ||
13 | 13 | ||
14 | #[derive(Debug, Default, PartialEq, Eq)] | 14 | #[derive(Debug, Default, PartialEq, Eq)] |
15 | pub struct ItemScope { | 15 | pub struct ItemScope { |