diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-03-25 12:53:48 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-03-25 12:53:48 +0000 |
commit | 785eb32f49653fbc5789396af4fa6ad61f89fb38 (patch) | |
tree | 122bfa08be70a7dc435a0bbb2cca720ce26e053b /crates/ra_hir/src/semantics.rs | |
parent | 8d667bb32ed8460988bf9fe3515a6f8318adb8b0 (diff) | |
parent | 2ccfb49baba6a9a0381e8a5be77df5a3c8f46205 (diff) |
Merge #3717
3717: Always expand macros during analysis r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/semantics.rs')
-rw-r--r-- | crates/ra_hir/src/semantics.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs index d982f6ffa..16a5fe968 100644 --- a/crates/ra_hir/src/semantics.rs +++ b/crates/ra_hir/src/semantics.rs | |||
@@ -173,11 +173,11 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> { | |||
173 | } | 173 | } |
174 | 174 | ||
175 | pub fn resolve_method_call(&self, call: &ast::MethodCallExpr) -> Option<Function> { | 175 | pub fn resolve_method_call(&self, call: &ast::MethodCallExpr) -> Option<Function> { |
176 | self.analyze(call.syntax()).resolve_method_call(call) | 176 | self.analyze(call.syntax()).resolve_method_call(self.db, call) |
177 | } | 177 | } |
178 | 178 | ||
179 | pub fn resolve_field(&self, field: &ast::FieldExpr) -> Option<StructField> { | 179 | pub fn resolve_field(&self, field: &ast::FieldExpr) -> Option<StructField> { |
180 | self.analyze(field.syntax()).resolve_field(field) | 180 | self.analyze(field.syntax()).resolve_field(self.db, field) |
181 | } | 181 | } |
182 | 182 | ||
183 | pub fn resolve_record_field( | 183 | pub fn resolve_record_field( |
@@ -188,7 +188,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> { | |||
188 | } | 188 | } |
189 | 189 | ||
190 | pub fn resolve_record_literal(&self, record_lit: &ast::RecordLit) -> Option<VariantDef> { | 190 | pub fn resolve_record_literal(&self, record_lit: &ast::RecordLit) -> Option<VariantDef> { |
191 | self.analyze(record_lit.syntax()).resolve_record_literal(record_lit) | 191 | self.analyze(record_lit.syntax()).resolve_record_literal(self.db, record_lit) |
192 | } | 192 | } |
193 | 193 | ||
194 | pub fn resolve_record_pattern(&self, record_pat: &ast::RecordPat) -> Option<VariantDef> { | 194 | pub fn resolve_record_pattern(&self, record_pat: &ast::RecordPat) -> Option<VariantDef> { |