diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-25 11:25:53 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-25 11:25:53 +0000 |
commit | 04ce89313369a1606b057b3be1368d72b8a5cd63 (patch) | |
tree | d85e49c985b92a9ccf1303a089dccdd4c805db1c /crates/ra_hir/src/db.rs | |
parent | ae97cd59ff086e7efb6409f14c2f8ae8861596e4 (diff) | |
parent | 64d4f4255880bbfb400551db38b76871276eaca6 (diff) |
Merge #638
638: reduce visibility r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 5a29e54d6..3c82262a2 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -4,15 +4,15 @@ use ra_syntax::{SyntaxNode, TreeArc, SourceFile}; | |||
4 | use ra_db::{SyntaxDatabase, CrateId, salsa}; | 4 | use ra_db::{SyntaxDatabase, CrateId, salsa}; |
5 | 5 | ||
6 | use crate::{ | 6 | use crate::{ |
7 | MacroCallId, Name, HirFileId, | 7 | MacroCallId, HirFileId, |
8 | SourceFileItems, SourceItemId, Crate, Module, HirInterner, | 8 | SourceFileItems, SourceItemId, Crate, Module, HirInterner, |
9 | query_definitions, | 9 | query_definitions, |
10 | Function, FnSignature, FnScopes, | 10 | Function, FnSignature, FnScopes, |
11 | Struct, Enum, | 11 | Struct, Enum, StructField, |
12 | macros::MacroExpansion, | 12 | macros::MacroExpansion, |
13 | module_tree::ModuleTree, | 13 | module_tree::ModuleTree, |
14 | nameres::{ItemMap, lower::{LoweredModule, ImportSourceMap}}, | 14 | nameres::{ItemMap, lower::{LoweredModule, ImportSourceMap}}, |
15 | ty::{InferenceResult, Ty, method_resolution::CrateImplBlocks, TypableDef, VariantDef}, | 15 | ty::{InferenceResult, Ty, method_resolution::CrateImplBlocks, TypableDef}, |
16 | adt::{StructData, EnumData}, | 16 | adt::{StructData, EnumData}, |
17 | impl_block::ModuleImplBlocks, | 17 | impl_block::ModuleImplBlocks, |
18 | generics::{GenericParams, GenericDef}, | 18 | generics::{GenericParams, GenericDef}, |
@@ -42,7 +42,7 @@ pub trait HirDatabase: SyntaxDatabase + AsRef<HirInterner> { | |||
42 | fn type_for_def(&self, def: TypableDef) -> Ty; | 42 | fn type_for_def(&self, def: TypableDef) -> Ty; |
43 | 43 | ||
44 | #[salsa::invoke(crate::ty::type_for_field)] | 44 | #[salsa::invoke(crate::ty::type_for_field)] |
45 | fn type_for_field(&self, def: VariantDef, field: Name) -> Option<Ty>; | 45 | fn type_for_field(&self, field: StructField) -> Ty; |
46 | 46 | ||
47 | #[salsa::invoke(query_definitions::file_items)] | 47 | #[salsa::invoke(query_definitions::file_items)] |
48 | fn file_items(&self, file_id: HirFileId) -> Arc<SourceFileItems>; | 48 | fn file_items(&self, file_id: HirFileId) -> Arc<SourceFileItems>; |