diff options
Diffstat (limited to 'crates/ra_hir_expand/src/builtin_macro.rs')
-rw-r--r-- | crates/ra_hir_expand/src/builtin_macro.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/ra_hir_expand/src/builtin_macro.rs index 7579546d2..93da3f149 100644 --- a/crates/ra_hir_expand/src/builtin_macro.rs +++ b/crates/ra_hir_expand/src/builtin_macro.rs | |||
@@ -5,7 +5,7 @@ use crate::{ | |||
5 | name, AstId, CrateId, MacroDefId, MacroDefKind, TextSize, | 5 | name, AstId, CrateId, MacroDefId, MacroDefKind, TextSize, |
6 | }; | 6 | }; |
7 | 7 | ||
8 | use crate::{quote, EagerMacroId, LazyMacroId, MacroCallId}; | 8 | use crate::{guess_crate, quote, EagerMacroId, LazyMacroId, MacroCallId}; |
9 | use either::Either; | 9 | use either::Either; |
10 | use mbe::parse_to_token_tree; | 10 | use mbe::parse_to_token_tree; |
11 | use ra_db::FileId; | 11 | use ra_db::FileId; |
@@ -335,8 +335,7 @@ fn include_expand( | |||
335 | fn get_env_inner(db: &dyn AstDatabase, arg_id: EagerMacroId, key: &str) -> Option<String> { | 335 | fn get_env_inner(db: &dyn AstDatabase, arg_id: EagerMacroId, key: &str) -> Option<String> { |
336 | let call_id: MacroCallId = arg_id.into(); | 336 | let call_id: MacroCallId = arg_id.into(); |
337 | let original_file = call_id.as_file().original_file(db); | 337 | let original_file = call_id.as_file().original_file(db); |
338 | 338 | let krate = guess_crate(db, original_file)?; | |
339 | let krate = *db.relevant_crates(original_file).get(0)?; | ||
340 | db.crate_graph()[krate].env.get(key) | 339 | db.crate_graph()[krate].env.get(key) |
341 | } | 340 | } |
342 | 341 | ||