diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-30 20:45:35 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-30 20:45:35 +0000 |
| commit | db17e06c2eec892ab807fd191bc11b15d8da42e2 (patch) | |
| tree | 18046068a9d7bb72747bbabfc22d1121fea1604a /crates/ra_hir/src/code_model_impl/function.rs | |
| parent | c65e6cdcb3d603ce7c0943785f7140662022c54a (diff) | |
| parent | 1acff307fe2e20f0c2291fd24b08fba6fa39e5ee (diff) | |
Merge #711
711: Rename FnScopes and move them below the expr module r=matklad a=flodiebold
Extracted from #693 to reduce the diff and make rebasing easier for me :wink:
The scopes belong to a body, which could be that of a function, but also a constant, static or array size. So this moves them to a submodule of `expr`.
Also move the `expr_scopes` query from `query_definitions` to that module.
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/code_model_impl/function.rs')
| -rw-r--r-- | crates/ra_hir/src/code_model_impl/function.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crates/ra_hir/src/code_model_impl/function.rs b/crates/ra_hir/src/code_model_impl/function.rs index e0dd4d629..422643996 100644 --- a/crates/ra_hir/src/code_model_impl/function.rs +++ b/crates/ra_hir/src/code_model_impl/function.rs | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | mod scope; | ||
| 2 | |||
| 3 | use std::sync::Arc; | 1 | use std::sync::Arc; |
| 4 | 2 | ||
| 5 | use ra_syntax::ast::{self, NameOwner}; | 3 | use ra_syntax::ast::{self, NameOwner}; |
| @@ -11,8 +9,6 @@ use crate::{ | |||
| 11 | impl_block::ImplBlock, | 9 | impl_block::ImplBlock, |
| 12 | }; | 10 | }; |
| 13 | 11 | ||
| 14 | pub use self::scope::{FnScopes, ScopesWithSyntaxMapping, ScopeEntryWithSyntax}; | ||
| 15 | |||
| 16 | impl Function { | 12 | impl Function { |
| 17 | pub(crate) fn body(&self, db: &impl HirDatabase) -> Arc<Body> { | 13 | pub(crate) fn body(&self, db: &impl HirDatabase) -> Arc<Body> { |
| 18 | db.body_hir(*self) | 14 | db.body_hir(*self) |