diff options
| author | Omer Ben-Amram <[email protected]> | 2019-12-14 15:29:30 +0000 |
|---|---|---|
| committer | Omer Ben-Amram <[email protected]> | 2019-12-14 15:29:30 +0000 |
| commit | 5e4e713fc9c201852fc5fbafd57e5b9243149a78 (patch) | |
| tree | 996b679a9ae1d07be1edd9eb04e93d433c6524a3 /crates/ra_hir/src/code_model.rs | |
| parent | 083010f6339e558184f06ce76a18e1ad0b0ee936 (diff) | |
| parent | 77db6177658b32f69ad7ebfdef96c1b3b2893fdd (diff) | |
Merge branch 'refs/heads/master' into feature/granular-scopes
Diffstat (limited to 'crates/ra_hir/src/code_model.rs')
| -rw-r--r-- | crates/ra_hir/src/code_model.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index c705d1630..7850ea9a7 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs | |||
| @@ -17,7 +17,7 @@ use hir_def::{ | |||
| 17 | }; | 17 | }; |
| 18 | use hir_expand::{ | 18 | use hir_expand::{ |
| 19 | diagnostics::DiagnosticSink, | 19 | diagnostics::DiagnosticSink, |
| 20 | name::{self, AsName}, | 20 | name::{name, AsName}, |
| 21 | MacroDefId, | 21 | MacroDefId, |
| 22 | }; | 22 | }; |
| 23 | use hir_ty::{ | 23 | use hir_ty::{ |
| @@ -723,7 +723,7 @@ impl Local { | |||
| 723 | } | 723 | } |
| 724 | 724 | ||
| 725 | pub fn is_self(self, db: &impl HirDatabase) -> bool { | 725 | pub fn is_self(self, db: &impl HirDatabase) -> bool { |
| 726 | self.name(db) == Some(name::SELF_PARAM) | 726 | self.name(db) == Some(name![self]) |
| 727 | } | 727 | } |
| 728 | 728 | ||
| 729 | pub fn is_mut(self, db: &impl HirDatabase) -> bool { | 729 | pub fn is_mut(self, db: &impl HirDatabase) -> bool { |