bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/tests/incremental.rs')
-rw-r--r--crates/hir-ty/src/tests/incremental.rs22
1 files changed, 11 insertions, 11 deletions
diff --git a/crates/hir-ty/src/tests/incremental.rs b/crates/hir-ty/src/tests/incremental.rs
index 3757d722ac..0542be0ba8 100644
--- a/crates/hir-ty/src/tests/incremental.rs
+++ b/crates/hir-ty/src/tests/incremental.rs
@@ -1,4 +1,4 @@
-use base_db::SourceDatabaseFileInputExt as _;
+use base_db::SourceDatabase;
use hir_def::ModuleDefId;
use test_fixture::WithFixture;
@@ -17,7 +17,7 @@ fn foo() -> i32 {
);
{
let events = db.log_executed(|| {
- let module = db.module_for_file(pos.file_id.file_id());
+ let module = db.module_for_file(pos.file_id.file_id(&db));
let crate_def_map = module.def_map(&db);
visit_module(&db, &crate_def_map, module.local_id, &mut |def| {
if let ModuleDefId::FunctionId(it) = def {
@@ -25,7 +25,7 @@ fn foo() -> i32 {
}
});
});
- assert!(format!("{events:?}").contains("infer"))
+ assert!(format!("{events:?}").contains("infer_shim"))
}
let new_text = "
@@ -35,11 +35,11 @@ fn foo() -> i32 {
1
}";
- db.set_file_text(pos.file_id.file_id(), new_text);
+ db.set_file_text(pos.file_id.file_id(&db), new_text);
{
let events = db.log_executed(|| {
- let module = db.module_for_file(pos.file_id.file_id());
+ let module = db.module_for_file(pos.file_id.file_id(&db));
let crate_def_map = module.def_map(&db);
visit_module(&db, &crate_def_map, module.local_id, &mut |def| {
if let ModuleDefId::FunctionId(it) = def {
@@ -47,7 +47,7 @@ fn foo() -> i32 {
}
});
});
- assert!(!format!("{events:?}").contains("infer"), "{events:#?}")
+ assert!(!format!("{events:?}").contains("infer_shim"), "{events:#?}")
}
}
@@ -68,7 +68,7 @@ fn baz() -> i32 {
);
{
let events = db.log_executed(|| {
- let module = db.module_for_file(pos.file_id.file_id());
+ let module = db.module_for_file(pos.file_id.file_id(&db));
let crate_def_map = module.def_map(&db);
visit_module(&db, &crate_def_map, module.local_id, &mut |def| {
if let ModuleDefId::FunctionId(it) = def {
@@ -76,7 +76,7 @@ fn baz() -> i32 {
}
});
});
- assert!(format!("{events:?}").contains("infer"))
+ assert!(format!("{events:?}").contains("infer_shim"))
}
let new_text = "
@@ -91,11 +91,11 @@ fn baz() -> i32 {
}
";
- db.set_file_text(pos.file_id.file_id(), new_text);
+ db.set_file_text(pos.file_id.file_id(&db), new_text);
{
let events = db.log_executed(|| {
- let module = db.module_for_file(pos.file_id.file_id());
+ let module = db.module_for_file(pos.file_id.file_id(&db));
let crate_def_map = module.def_map(&db);
visit_module(&db, &crate_def_map, module.local_id, &mut |def| {
if let ModuleDefId::FunctionId(it) = def {
@@ -103,6 +103,6 @@ fn baz() -> i32 {
}
});
});
- assert!(format!("{events:?}").matches("infer").count() == 1, "{events:#?}")
+ assert_eq!(format!("{events:?}").matches("infer_shim").count(), 1, "{events:#?}")
}
}