diff options
| author | Seivan Heidari <[email protected]> | 2019-11-04 23:00:30 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-11-04 23:00:30 +0000 |
| commit | 8eb5148af7e7a87a685f7581809368b13eaa17ec (patch) | |
| tree | 7f0ac4da3fa6e487fe1692a041d4d1144fd3d8db /crates/ra_hir/src/db.rs | |
| parent | c60f9bf4c6d6ddd341c673b228b6aa1add3da62b (diff) | |
| parent | 38f2bd21fbecf1c997a4ab9a8913e8b5487088e3 (diff) | |
Merge branch 'master' into feature/themes
Diffstat (limited to 'crates/ra_hir/src/db.rs')
| -rw-r--r-- | crates/ra_hir/src/db.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index eb66325f7..11b3f94ae 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
| @@ -14,10 +14,10 @@ use crate::{ | |||
| 14 | traits::TraitData, | 14 | traits::TraitData, |
| 15 | ty::{ | 15 | ty::{ |
| 16 | method_resolution::CrateImplBlocks, traits::Impl, CallableDef, FnSig, GenericPredicate, | 16 | method_resolution::CrateImplBlocks, traits::Impl, CallableDef, FnSig, GenericPredicate, |
| 17 | InferenceResult, Substs, Ty, TypableDef, TypeCtor, | 17 | InferenceResult, Namespace, Substs, Ty, TypableDef, TypeCtor, |
| 18 | }, | 18 | }, |
| 19 | type_alias::TypeAliasData, | 19 | type_alias::TypeAliasData, |
| 20 | Const, ConstData, Crate, DefWithBody, ExprScopes, FnData, Function, Module, Namespace, Static, | 20 | Const, ConstData, Crate, DefWithBody, ExprScopes, FnData, Function, Module, Static, |
| 21 | StructField, Trait, TypeAlias, | 21 | StructField, Trait, TypeAlias, |
| 22 | }; | 22 | }; |
| 23 | 23 | ||