diff options
author | Aleksey Kladov <[email protected]> | 2019-06-11 16:14:27 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-06-11 16:28:51 +0100 |
commit | ff6f6b3a5223ddab81c7357a3c59bdb09936a552 (patch) | |
tree | b6fee9faf5f82ba6ee063667605e39ac3bcbe37c /crates/ra_hir/src | |
parent | f6c227babdeb2d6b6888b36ddcbd8eb220240fa2 (diff) |
move docs under code model
Diffstat (limited to 'crates/ra_hir/src')
-rw-r--r-- | crates/ra_hir/src/code_model.rs | 1 | ||||
-rw-r--r-- | crates/ra_hir/src/code_model/docs.rs (renamed from crates/ra_hir/src/docs.rs) | 0 | ||||
-rw-r--r-- | crates/ra_hir/src/db.rs | 4 | ||||
-rw-r--r-- | crates/ra_hir/src/lib.rs | 3 |
4 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index 0cfab27dc..830aea1f3 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs | |||
@@ -1,4 +1,5 @@ | |||
1 | pub(crate) mod src; | 1 | pub(crate) mod src; |
2 | pub(crate) mod docs; | ||
2 | 3 | ||
3 | use std::sync::Arc; | 4 | use std::sync::Arc; |
4 | 5 | ||
diff --git a/crates/ra_hir/src/docs.rs b/crates/ra_hir/src/code_model/docs.rs index da2b9b854..da2b9b854 100644 --- a/crates/ra_hir/src/docs.rs +++ b/crates/ra_hir/src/code_model/docs.rs | |||
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index d2a372f3b..d2d6f95b7 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -128,8 +128,8 @@ pub trait DefDatabase: SourceDatabase { | |||
128 | #[salsa::invoke(crate::lang_item::LangItems::lang_item_query)] | 128 | #[salsa::invoke(crate::lang_item::LangItems::lang_item_query)] |
129 | fn lang_item(&self, start_crate: Crate, item: SmolStr) -> Option<LangItemTarget>; | 129 | fn lang_item(&self, start_crate: Crate, item: SmolStr) -> Option<LangItemTarget>; |
130 | 130 | ||
131 | #[salsa::invoke(crate::docs::documentation_query)] | 131 | #[salsa::invoke(crate::code_model::docs::documentation_query)] |
132 | fn documentation(&self, def: crate::docs::DocDef) -> Option<crate::docs::Documentation>; | 132 | fn documentation(&self, def: crate::DocDef) -> Option<crate::Documentation>; |
133 | } | 133 | } |
134 | 134 | ||
135 | #[salsa::query_group(HirDatabaseStorage)] | 135 | #[salsa::query_group(HirDatabaseStorage)] |
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index 1690296e5..2e99bdac8 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -38,7 +38,6 @@ mod impl_block; | |||
38 | mod expr; | 38 | mod expr; |
39 | mod lang_item; | 39 | mod lang_item; |
40 | mod generics; | 40 | mod generics; |
41 | mod docs; | ||
42 | mod resolve; | 41 | mod resolve; |
43 | pub mod diagnostics; | 42 | pub mod diagnostics; |
44 | 43 | ||
@@ -64,7 +63,6 @@ pub use self::{ | |||
64 | nameres::{PerNs, Namespace, ImportId}, | 63 | nameres::{PerNs, Namespace, ImportId}, |
65 | ty::{Ty, ApplicationTy, TypeCtor, TraitRef, Substs, display::HirDisplay, CallableDef}, | 64 | ty::{Ty, ApplicationTy, TypeCtor, TraitRef, Substs, display::HirDisplay, CallableDef}, |
66 | impl_block::{ImplBlock, ImplItem}, | 65 | impl_block::{ImplBlock, ImplItem}, |
67 | docs::{Docs, Documentation}, | ||
68 | adt::AdtDef, | 66 | adt::AdtDef, |
69 | expr::ExprScopes, | 67 | expr::ExprScopes, |
70 | resolve::Resolution, | 68 | resolve::Resolution, |
@@ -83,4 +81,5 @@ pub use self::code_model::{ | |||
83 | Trait, TypeAlias, MacroDef, Container, | 81 | Trait, TypeAlias, MacroDef, Container, |
84 | BuiltinType, | 82 | BuiltinType, |
85 | src::{Source, HasSource}, | 83 | src::{Source, HasSource}, |
84 | docs::{Docs, Documentation, DocDef}, | ||
86 | }; | 85 | }; |