diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-01 22:37:59 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-01 22:37:59 +0000 |
| commit | 4447019f4b5f24728bb7b91b161755ddb373c74c (patch) | |
| tree | c53ff3531cbbad182e821eb92fa9ad201d2bff0c /crates/ra_hir/src/code_model_impl | |
| parent | 2b5c226e86892113bcab478cdf4c9adaf1e7b2f6 (diff) | |
| parent | c5852f422ff45adaa21815c1a15e03b067a56a82 (diff) | |
Merge #693
693: Name resolution refactoring r=matklad a=flodiebold
This is still very WIP, but it's becoming quite big and I want to make sure this isn't going in a completely bad direction :sweat_smile:. I'm not really happy with how the path resolution looks, and I'm not sure `PerNs<Resolution>` is the best return type -- there are 'this cannot happen in the (types/values) namespace' cases everywhere. I also want to unify the `resolver` and `nameres` namespaces once I'm done switching everything to `Resolver`. Also, `Resolver` only has a lifetime because it needs to have a reference to the `ItemMap` during import resolution :confused:
The differences in the completion snapshots are almost completely just ordering (except it completes `Self` as well now), so I changed it to sort the completions before snapshotting.
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/code_model_impl')
| -rw-r--r-- | crates/ra_hir/src/code_model_impl/function.rs | 6 |
1 files changed, 2 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 5b0b31b1d..8326c02c7 100644 --- a/crates/ra_hir/src/code_model_impl/function.rs +++ b/crates/ra_hir/src/code_model_impl/function.rs | |||
| @@ -5,14 +5,12 @@ use ra_syntax::ast::{self, NameOwner}; | |||
| 5 | use crate::{ | 5 | use crate::{ |
| 6 | HirDatabase, Name, AsName, Function, FnSignature, | 6 | HirDatabase, Name, AsName, Function, FnSignature, |
| 7 | type_ref::{TypeRef, Mutability}, | 7 | type_ref::{TypeRef, Mutability}, |
| 8 | expr::Body, PersistentHirDatabase, | 8 | PersistentHirDatabase, |
| 9 | impl_block::ImplBlock, | 9 | impl_block::ImplBlock, |
| 10 | }; | 10 | }; |
| 11 | 11 | ||
| 12 | impl Function { | 12 | impl Function { |
| 13 | pub(crate) fn body(&self, db: &impl HirDatabase) -> Arc<Body> { | 13 | // TODO impl_block should probably also be part of the code model API? |
| 14 | db.body_hir(*self) | ||
| 15 | } | ||
| 16 | 14 | ||
| 17 | /// The containing impl block, if this is a method. | 15 | /// The containing impl block, if this is a method. |
| 18 | pub(crate) fn impl_block(&self, db: &impl HirDatabase) -> Option<ImplBlock> { | 16 | pub(crate) fn impl_block(&self, db: &impl HirDatabase) -> Option<ImplBlock> { |