mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-10-27 02:06:57 +00:00
Make HirFileId, EditionedFileId and macro files Salsa struct
And make more queries non-interned. Also flip the default for queries, now the default is to not intern and to intern a query you need to say `invoke_interned`.
This commit is contained in:
parent
02ade79631
commit
c58ddafe90
195 changed files with 1473 additions and 1525 deletions
|
|
@ -1,5 +1,6 @@
|
|||
use hir_def::db::DefDatabase;
|
||||
use span::{Edition, EditionedFileId};
|
||||
use hir_expand::EditionedFileId;
|
||||
use span::Edition;
|
||||
use syntax::{TextRange, TextSize};
|
||||
use test_fixture::WithFixture;
|
||||
|
||||
|
|
@ -9,7 +10,7 @@ use crate::{Interner, Substitution, db::HirDatabase, mir::MirLowerError, test_db
|
|||
use super::{MirEvalError, interpret_mir};
|
||||
|
||||
fn eval_main(db: &TestDB, file_id: EditionedFileId) -> Result<(String, String), MirEvalError> {
|
||||
let module_id = db.module_for_file(file_id);
|
||||
let module_id = db.module_for_file(file_id.file_id(db));
|
||||
let def_map = module_id.def_map(db);
|
||||
let scope = &def_map[module_id.local_id].scope;
|
||||
let func_id = scope
|
||||
|
|
@ -69,7 +70,7 @@ fn check_pass_and_stdio(
|
|||
let span_formatter = |file, range: TextRange| {
|
||||
format!("{:?} {:?}..{:?}", file, line_index(range.start()), line_index(range.end()))
|
||||
};
|
||||
let krate = db.module_for_file(file_id).krate();
|
||||
let krate = db.module_for_file(file_id.file_id(&db)).krate();
|
||||
e.pretty_print(&mut err, &db, span_formatter, DisplayTarget::from_crate(&db, krate))
|
||||
.unwrap();
|
||||
panic!("Error in interpreting: {err}");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue