From 6e24321e4579d25686982002ed18f321db23cb9f Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 9 Dec 2020 19:01:15 +0300 Subject: Introduce anchored_path They allow to represent paths like `#[path = "C:\path.rs"] mod foo;` in a lossless cross-platform & network-transparent way. --- crates/hir_expand/src/builtin_macro.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'crates/hir_expand/src/builtin_macro.rs') diff --git a/crates/hir_expand/src/builtin_macro.rs b/crates/hir_expand/src/builtin_macro.rs index 79b970850..f60666a54 100644 --- a/crates/hir_expand/src/builtin_macro.rs +++ b/crates/hir_expand/src/builtin_macro.rs @@ -4,7 +4,7 @@ use crate::{ MacroDefId, MacroDefKind, TextSize, }; -use base_db::FileId; +use base_db::{AnchoredPath, FileId}; use either::Either; use mbe::{parse_to_token_tree, ExpandResult}; use parser::FragmentKind; @@ -324,7 +324,8 @@ fn relative_file( allow_recursion: bool, ) -> Option { let call_site = call_id.as_file().original_file(db); - let res = db.resolve_path(call_site, path)?; + let path = AnchoredPath { anchor: call_site, path }; + let res = db.resolve_path(path)?; // Prevent include itself if res == call_site && !allow_recursion { None -- cgit v1.2.3