language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Make relevant_crates return a Set

Browse source
This commit is contained in:
Aleksey Kladov 2020-06-11 11:30:06 +02:00
parent f632727b2a
commit d8a5d39c2d
11 changed files with 36 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/ra_hir_expand/src/builtin_macro.rs
View file

@ -5,7 +5,7 @@ use crate::{
name, AstId, CrateId, MacroDefId, MacroDefKind, TextSize,
};
use crate::{quote, EagerMacroId, LazyMacroId, MacroCallId};
use crate::{guess_crate, quote, EagerMacroId, LazyMacroId, MacroCallId};
use either::Either;
use mbe::parse_to_token_tree;
use ra_db::FileId;
@ -335,8 +335,7 @@ fn include_expand(
fn get_env_inner(db: &dyn AstDatabase, arg_id: EagerMacroId, key: &str) -> Option<String> {
let call_id: MacroCallId = arg_id.into();
let original_file = call_id.as_file().original_file(db);
let krate = *db.relevant_crates(original_file).get(0)?;
let krate = guess_crate(db, original_file)?;
db.crate_graph()[krate].env.get(key)
}