diff options
| author | Seivan Heidari <[email protected]> | 2019-11-14 22:20:27 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-11-14 22:20:27 +0000 |
| commit | c622413bc72ea56d5f62a16788d897cb61eca948 (patch) | |
| tree | 9de3dbe8b5c935ed168efac4e70770e54fbe0714 /crates/ra_hir/src/resolve.rs | |
| parent | 0525778a3ad590492b51cc11085d815f9bb8f92b (diff) | |
| parent | bbb022d3999b3038549ec6c309efb065231c896a (diff) | |
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
Diffstat (limited to 'crates/ra_hir/src/resolve.rs')
| -rw-r--r-- | crates/ra_hir/src/resolve.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs index b932b0c8c..2f3e12eb8 100644 --- a/crates/ra_hir/src/resolve.rs +++ b/crates/ra_hir/src/resolve.rs | |||
| @@ -13,10 +13,7 @@ use rustc_hash::FxHashSet; | |||
| 13 | use crate::{ | 13 | use crate::{ |
| 14 | code_model::Crate, | 14 | code_model::Crate, |
| 15 | db::{DefDatabase, HirDatabase}, | 15 | db::{DefDatabase, HirDatabase}, |
| 16 | expr::{ | 16 | expr::{ExprScopes, PatId, ScopeId}, |
| 17 | scope::{ExprScopes, ScopeId}, | ||
| 18 | PatId, | ||
| 19 | }, | ||
| 20 | generics::GenericParams, | 17 | generics::GenericParams, |
| 21 | impl_block::ImplBlock, | 18 | impl_block::ImplBlock, |
| 22 | Adt, Const, Enum, EnumVariant, Function, MacroDef, ModuleDef, PerNs, Static, Struct, Trait, | 19 | Adt, Const, Enum, EnumVariant, Function, MacroDef, ModuleDef, PerNs, Static, Struct, Trait, |