aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/resolve.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-09-18 02:36:40 +0100
committerGitHub <[email protected]>2019-09-18 02:36:40 +0100
commit630d212525192c714d4fbab398031aa88c49e538 (patch)
tree742e3278b495b3a8827a7ac1628e66aa76948ff8 /crates/ra_hir/src/resolve.rs
parent54379ec6f8f82a470a275771e70825634d3d553b (diff)
parent7d15c81a3367bc538470b5f63d61498eef8efdc7 (diff)
Merge #1861
1861: account for impls generated by macros r=matklad a=matklad The code is pretty horrible and is copy-pased from expressions. We really need to find a better way to lower stuff generated by macros. But it gets the job done! I've actually though that we did this ages ago, but obviously we didn't Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/resolve.rs')
-rw-r--r--crates/ra_hir/src/resolve.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index a23c8792a..254d1a964 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -5,7 +5,7 @@ use rustc_hash::FxHashSet;
5 5
6use crate::{ 6use crate::{
7 code_model::Crate, 7 code_model::Crate,
8 db::HirDatabase, 8 db::{DefDatabase, HirDatabase},
9 expr::{ 9 expr::{
10 scope::{ExprScopes, ScopeId}, 10 scope::{ExprScopes, ScopeId},
11 PatId, 11 PatId,
@@ -290,7 +290,7 @@ impl Resolver {
290 290
291 pub(crate) fn resolve_path_as_macro( 291 pub(crate) fn resolve_path_as_macro(
292 &self, 292 &self,
293 db: &impl HirDatabase, 293 db: &impl DefDatabase,
294 path: &Path, 294 path: &Path,
295 ) -> Option<MacroDef> { 295 ) -> Option<MacroDef> {
296 let (item_map, module) = self.module()?; 296 let (item_map, module) = self.module()?;