diff options
| author | Seivan Heidari <[email protected]> | 2019-11-18 01:27:53 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-11-18 01:27:53 +0000 |
| commit | 166636ba77adcf5bf2c4ef935e9aa75e20f25e10 (patch) | |
| tree | 168be1ca55c73b016e20586c08417c608450c92c /crates/ra_hir/src/resolve.rs | |
| parent | cb26df950699586b314731fb70786e0db8eaa049 (diff) | |
| parent | 28c2d74b2150102a8756a5357a5a965d7610bd15 (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, 2 insertions, 3 deletions
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs index 2fb913108..79b92180a 100644 --- a/crates/ra_hir/src/resolve.rs +++ b/crates/ra_hir/src/resolve.rs | |||
| @@ -15,9 +15,8 @@ use crate::{ | |||
| 15 | db::{DefDatabase, HirDatabase}, | 15 | db::{DefDatabase, HirDatabase}, |
| 16 | expr::{ExprScopes, PatId, ScopeId}, | 16 | expr::{ExprScopes, PatId, ScopeId}, |
| 17 | generics::GenericParams, | 17 | generics::GenericParams, |
| 18 | impl_block::ImplBlock, | 18 | Adt, Const, DefWithBody, Enum, EnumVariant, Function, ImplBlock, Local, MacroDef, ModuleDef, |
| 19 | Adt, Const, DefWithBody, Enum, EnumVariant, Function, Local, MacroDef, ModuleDef, PerNs, | 19 | PerNs, Static, Struct, Trait, TypeAlias, |
| 20 | Static, Struct, Trait, TypeAlias, | ||
| 21 | }; | 20 | }; |
| 22 | 21 | ||
| 23 | #[derive(Debug, Clone, Default)] | 22 | #[derive(Debug, Clone, Default)] |