aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_expand/src/builtin_macro.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-06-05 14:07:30 +0100
committerAleksey Kladov <[email protected]>2020-06-05 14:07:30 +0100
commitbba374bab2ee53643a899e7ea459b4ab27663bd0 (patch)
tree77610cd5b460dba0c350a5a9504b813bb3e8be98 /crates/ra_hir_expand/src/builtin_macro.rs
parente63c00f100e960f7b72997026b4b2cd3cd29774b (diff)
More direct signature for resolve_path
Diffstat (limited to 'crates/ra_hir_expand/src/builtin_macro.rs')
-rw-r--r--crates/ra_hir_expand/src/builtin_macro.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/ra_hir_expand/src/builtin_macro.rs
index 4374d9eda..eec5fb8eb 100644
--- a/crates/ra_hir_expand/src/builtin_macro.rs
+++ b/crates/ra_hir_expand/src/builtin_macro.rs
@@ -8,7 +8,7 @@ use crate::{
8use crate::{quote, EagerMacroId, LazyMacroId, MacroCallId}; 8use crate::{quote, EagerMacroId, LazyMacroId, MacroCallId};
9use either::Either; 9use either::Either;
10use mbe::parse_to_token_tree; 10use mbe::parse_to_token_tree;
11use ra_db::{FileId, RelativePath}; 11use ra_db::FileId;
12use ra_parser::FragmentKind; 12use ra_parser::FragmentKind;
13 13
14macro_rules! register_builtin { 14macro_rules! register_builtin {
@@ -297,7 +297,7 @@ fn relative_file(db: &dyn AstDatabase, call_id: MacroCallId, path: &str) -> Opti
297 let call_site = call_id.as_file().original_file(db); 297 let call_site = call_id.as_file().original_file(db);
298 298
299 // Handle trivial case 299 // Handle trivial case
300 if let Some(res) = db.resolve_path(call_site, &RelativePath::new(&path)) { 300 if let Some(res) = db.resolve_path(call_site, path) {
301 // Prevent include itself 301 // Prevent include itself
302 return if res == call_site { None } else { Some(res) }; 302 return if res == call_site { None } else { Some(res) };
303 } 303 }