diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-11 15:35:41 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-11 15:35:41 +0000 |
commit | aad1bf877e4ba5ce9e28e8bde14f790ef8d1551b (patch) | |
tree | 9d3ea7f166adcd09fb77cfdb7fc1bad03efc95cd /crates/ra_hir | |
parent | 0b83bde6e2f3782ea6acd907fa0a634912cebb3d (diff) | |
parent | f23a13bfa7bae7e34070bfd14d22b70a82315022 (diff) |
Merge #496
496: Include two element ranges into the nav. r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir')
-rw-r--r-- | crates/ra_hir/src/code_model_api.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir/src/code_model_impl/function.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir/src/lib.rs | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs index e69f546ff..8ec6b9b2b 100644 --- a/crates/ra_hir/src/code_model_api.rs +++ b/crates/ra_hir/src/code_model_api.rs | |||
@@ -274,6 +274,8 @@ pub struct Function { | |||
274 | pub(crate) def_id: DefId, | 274 | pub(crate) def_id: DefId, |
275 | } | 275 | } |
276 | 276 | ||
277 | pub use crate::code_model_impl::function::ScopeEntryWithSyntax; | ||
278 | |||
277 | /// The declared signature of a function. | 279 | /// The declared signature of a function. |
278 | #[derive(Debug, Clone, PartialEq, Eq)] | 280 | #[derive(Debug, Clone, PartialEq, Eq)] |
279 | pub struct FnSignature { | 281 | pub struct FnSignature { |
diff --git a/crates/ra_hir/src/code_model_impl/function.rs b/crates/ra_hir/src/code_model_impl/function.rs index 1bd4cc802..009175bab 100644 --- a/crates/ra_hir/src/code_model_impl/function.rs +++ b/crates/ra_hir/src/code_model_impl/function.rs | |||
@@ -15,7 +15,7 @@ use crate::{ | |||
15 | impl_block::ImplBlock, | 15 | impl_block::ImplBlock, |
16 | }; | 16 | }; |
17 | 17 | ||
18 | pub use self::scope::{FnScopes, ScopesWithSyntaxMapping}; | 18 | pub use self::scope::{FnScopes, ScopesWithSyntaxMapping, ScopeEntryWithSyntax}; |
19 | 19 | ||
20 | impl Function { | 20 | impl Function { |
21 | pub(crate) fn new(def_id: DefId) -> Function { | 21 | pub(crate) fn new(def_id: DefId) -> Function { |
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index 1aca2f067..fe8be5700 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -59,5 +59,5 @@ pub use self::code_model_api::{ | |||
59 | Def, | 59 | Def, |
60 | Module, ModuleSource, Problem, | 60 | Module, ModuleSource, Problem, |
61 | Struct, Enum, EnumVariant, | 61 | Struct, Enum, EnumVariant, |
62 | Function, FnSignature, | 62 | Function, FnSignature, ScopeEntryWithSyntax, |
63 | }; | 63 | }; |