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.rs97
1 files changed, 49 insertions, 48 deletions
diff --git a/crates/hir-ty/src/tests/incremental.rs b/crates/hir-ty/src/tests/incremental.rs
index 3432d47b2f..08efef10ee 100644
--- a/crates/hir-ty/src/tests/incremental.rs
+++ b/crates/hir-ty/src/tests/incremental.rs
@@ -28,16 +28,16 @@ fn foo() -> i32 {
}
});
},
- &[("InferenceResult::for_body_", 1)],
+ &[("InferenceResult < 'db >::for_body_", 1)],
expect_test::expect![[r#"
[
"source_root_crates",
"crate_local_def_map",
"file_item_tree_query",
"HirFileId::ast_id_map_",
- "parse",
+ "EditionedFileId::parse_",
"real_span_map",
- "InferenceResult::for_body_",
+ "InferenceResult < 'db >::for_body_",
"FunctionSignature::of_",
"FunctionSignature::with_source_map_",
"AttrFlags::query_",
@@ -74,10 +74,10 @@ fn foo() -> i32 {
}
});
},
- &[("InferenceResult::for_body_", 0)],
+ &[("InferenceResult < 'db >::for_body_", 0)],
expect_test::expect![[r#"
[
- "parse",
+ "EditionedFileId::parse_",
"HirFileId::ast_id_map_",
"file_item_tree_query",
"real_span_map",
@@ -117,16 +117,16 @@ fn baz() -> i32 {
}
});
},
- &[("InferenceResult::for_body_", 3)],
+ &[("InferenceResult < 'db >::for_body_", 3)],
expect_test::expect![[r#"
[
"source_root_crates",
"crate_local_def_map",
"file_item_tree_query",
"HirFileId::ast_id_map_",
- "parse",
+ "EditionedFileId::parse_",
"real_span_map",
- "InferenceResult::for_body_",
+ "InferenceResult < 'db >::for_body_",
"FunctionSignature::of_",
"FunctionSignature::with_source_map_",
"AttrFlags::query_",
@@ -139,7 +139,7 @@ fn baz() -> i32 {
"ImplTraits::return_type_impl_traits_",
"ExprScopes::body_expr_scopes_",
"body_upvars_mentioned",
- "InferenceResult::for_body_",
+ "InferenceResult < 'db >::for_body_",
"FunctionSignature::of_",
"FunctionSignature::with_source_map_",
"AttrFlags::query_",
@@ -150,7 +150,7 @@ fn baz() -> i32 {
"ImplTraits::return_type_impl_traits_",
"ExprScopes::body_expr_scopes_",
"body_upvars_mentioned",
- "InferenceResult::for_body_",
+ "InferenceResult < 'db >::for_body_",
"FunctionSignature::of_",
"FunctionSignature::with_source_map_",
"AttrFlags::query_",
@@ -190,10 +190,10 @@ fn baz() -> i32 {
}
});
},
- &[("InferenceResult::for_body_", 1)],
+ &[("InferenceResult < 'db >::for_body_", 1)],
expect_test::expect![[r#"
[
- "parse",
+ "EditionedFileId::parse_",
"HirFileId::ast_id_map_",
"file_item_tree_query",
"real_span_map",
@@ -207,7 +207,7 @@ fn baz() -> i32 {
"FunctionSignature::of_",
"Body::with_source_map_",
"Body::of_",
- "InferenceResult::for_body_",
+ "InferenceResult < 'db >::for_body_",
"ExprScopes::body_expr_scopes_",
"body_upvars_mentioned",
"AttrFlags::query_",
@@ -241,16 +241,16 @@ $0",
let _crate_def_map = module.def_map(&db);
TraitImpls::for_crate(&db, module.krate(&db));
},
- &[("TraitImpls::for_crate_", 1)],
+ &[("TraitImpls < 'db >::for_crate_", 1)],
expect_test::expect![[r#"
[
"source_root_crates",
"crate_local_def_map",
"file_item_tree_query",
"HirFileId::ast_id_map_",
- "parse",
+ "EditionedFileId::parse_",
"real_span_map",
- "TraitImpls::for_crate_",
+ "TraitImpls < 'db >::for_crate_",
"lang_items",
"crate_lang_items",
]
@@ -280,15 +280,15 @@ pub struct NewStruct {
let _crate_def_map = module.def_map(&db);
TraitImpls::for_crate(&db, module.krate(&db));
},
- &[("TraitImpls::for_crate_", 1)],
+ &[("TraitImpls < 'db >::for_crate_", 1)],
expect_test::expect![[r#"
[
- "parse",
+ "EditionedFileId::parse_",
"HirFileId::ast_id_map_",
"file_item_tree_query",
"real_span_map",
"crate_local_def_map",
- "TraitImpls::for_crate_",
+ "TraitImpls < 'db >::for_crate_",
"crate_lang_items",
]
"#]],
@@ -316,16 +316,16 @@ $0",
let _crate_def_map = module.def_map(&db);
TraitImpls::for_crate(&db, module.krate(&db));
},
- &[("TraitImpls::for_crate_", 1)],
+ &[("TraitImpls < 'db >::for_crate_", 1)],
expect_test::expect![[r#"
[
"source_root_crates",
"crate_local_def_map",
"file_item_tree_query",
"HirFileId::ast_id_map_",
- "parse",
+ "EditionedFileId::parse_",
"real_span_map",
- "TraitImpls::for_crate_",
+ "TraitImpls < 'db >::for_crate_",
"lang_items",
"crate_lang_items",
]
@@ -356,15 +356,15 @@ pub enum SomeEnum {
let _crate_def_map = module.def_map(&db);
TraitImpls::for_crate(&db, module.krate(&db));
},
- &[("TraitImpls::for_crate_", 1)],
+ &[("TraitImpls < 'db >::for_crate_", 1)],
expect_test::expect![[r#"
[
- "parse",
+ "EditionedFileId::parse_",
"HirFileId::ast_id_map_",
"file_item_tree_query",
"real_span_map",
"crate_local_def_map",
- "TraitImpls::for_crate_",
+ "TraitImpls < 'db >::for_crate_",
"crate_lang_items",
]
"#]],
@@ -392,16 +392,16 @@ $0",
let _crate_def_map = module.def_map(&db);
TraitImpls::for_crate(&db, module.krate(&db));
},
- &[("TraitImpls::for_crate_", 1)],
+ &[("TraitImpls < 'db >::for_crate_", 1)],
expect_test::expect![[r#"
[
"source_root_crates",
"crate_local_def_map",
"file_item_tree_query",
"HirFileId::ast_id_map_",
- "parse",
+ "EditionedFileId::parse_",
"real_span_map",
- "TraitImpls::for_crate_",
+ "TraitImpls < 'db >::for_crate_",
"lang_items",
"crate_lang_items",
]
@@ -429,15 +429,15 @@ fn bar() -> f32 {
let _crate_def_map = module.def_map(&db);
TraitImpls::for_crate(&db, module.krate(&db));
},
- &[("TraitImpls::for_crate_", 1)],
+ &[("TraitImpls < 'db >::for_crate_", 1)],
expect_test::expect![[r#"
[
- "parse",
+ "EditionedFileId::parse_",
"HirFileId::ast_id_map_",
"file_item_tree_query",
"real_span_map",
"crate_local_def_map",
- "TraitImpls::for_crate_",
+ "TraitImpls < 'db >::for_crate_",
"crate_lang_items",
]
"#]],
@@ -469,16 +469,16 @@ $0",
let _crate_def_map = module.def_map(&db);
TraitImpls::for_crate(&db, module.krate(&db));
},
- &[("TraitImpls::for_crate_", 1)],
+ &[("TraitImpls < 'db >::for_crate_", 1)],
expect_test::expect![[r#"
[
"source_root_crates",
"crate_local_def_map",
"file_item_tree_query",
"HirFileId::ast_id_map_",
- "parse",
+ "EditionedFileId::parse_",
"real_span_map",
- "TraitImpls::for_crate_",
+ "TraitImpls < 'db >::for_crate_",
"lang_items",
"crate_lang_items",
]
@@ -514,15 +514,15 @@ impl SomeStruct {
let _crate_def_map = module.def_map(&db);
TraitImpls::for_crate(&db, module.krate(&db));
},
- &[("TraitImpls::for_crate_", 1)],
+ &[("TraitImpls < 'db >::for_crate_", 1)],
expect_test::expect![[r#"
[
- "parse",
+ "EditionedFileId::parse_",
"HirFileId::ast_id_map_",
"file_item_tree_query",
"real_span_map",
"crate_local_def_map",
- "TraitImpls::for_crate_",
+ "TraitImpls < 'db >::for_crate_",
"crate_lang_items",
]
"#]],
@@ -570,6 +570,7 @@ fn main() {
let _inference_result = InferenceResult::of(&db, def);
}
},
+ // FIXME: What does this test check for now? trait_solve_shim is no longer a query
&[("trait_solve_shim", 0)],
expect_test::expect![[r#"
[
@@ -577,14 +578,14 @@ fn main() {
"crate_local_def_map",
"file_item_tree_query",
"HirFileId::ast_id_map_",
- "parse",
+ "EditionedFileId::parse_",
"real_span_map",
"TraitItems::query_with_diagnostics_",
"Body::of_",
"Body::with_source_map_",
"AttrFlags::query_",
"ImplItems::of_",
- "InferenceResult::for_body_",
+ "InferenceResult < 'db >::for_body_",
"TraitSignature::of_",
"TraitSignature::with_source_map_",
"AttrFlags::query_",
@@ -600,7 +601,7 @@ fn main() {
"GenericPredicates::query_with_diagnostics_",
"ImplTraits::return_type_impl_traits_",
"body_upvars_mentioned",
- "InferenceResult::for_body_",
+ "InferenceResult < 'db >::for_body_",
"FunctionSignature::of_",
"FunctionSignature::with_source_map_",
"trait_environment_query",
@@ -611,10 +612,10 @@ fn main() {
"StructSignature::with_source_map_",
"AttrFlags::query_",
"GenericPredicates::query_with_diagnostics_",
- "InherentImpls::for_crate_",
+ "InherentImpls < 'db >::for_crate_",
"callable_item_signature_with_diagnostics",
- "TraitImpls::for_crate_and_deps_",
- "TraitImpls::for_crate_",
+ "TraitImpls < 'db >::for_crate_and_deps_",
+ "TraitImpls < 'db >::for_crate_",
"impl_trait_with_diagnostics",
"ImplSignature::of_",
"ImplSignature::with_source_map_",
@@ -670,7 +671,7 @@ fn main() {
&[("trait_solve_shim", 0)],
expect_test::expect![[r#"
[
- "parse",
+ "EditionedFileId::parse_",
"HirFileId::ast_id_map_",
"file_item_tree_query",
"real_span_map",
@@ -680,7 +681,7 @@ fn main() {
"AttrFlags::query_",
"Body::of_",
"ImplItems::of_",
- "InferenceResult::for_body_",
+ "InferenceResult < 'db >::for_body_",
"AttrFlags::query_",
"TraitSignature::with_source_map_",
"AttrFlags::query_",
@@ -693,7 +694,7 @@ fn main() {
"GenericPredicates::query_with_diagnostics_",
"ImplTraits::return_type_impl_traits_",
"body_upvars_mentioned",
- "InferenceResult::for_body_",
+ "InferenceResult < 'db >::for_body_",
"FunctionSignature::with_source_map_",
"GenericPredicates::query_with_diagnostics_",
"ImplTraits::return_type_impl_traits_",
@@ -701,9 +702,9 @@ fn main() {
"StructSignature::with_source_map_",
"AttrFlags::query_",
"GenericPredicates::query_with_diagnostics_",
- "InherentImpls::for_crate_",
+ "InherentImpls < 'db >::for_crate_",
"callable_item_signature_with_diagnostics",
- "TraitImpls::for_crate_",
+ "TraitImpls < 'db >::for_crate_",
"ImplSignature::with_source_map_",
"ImplSignature::of_",
"impl_trait_with_diagnostics",