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.rs140
1 files changed, 70 insertions, 70 deletions
diff --git a/crates/hir-ty/src/tests/incremental.rs b/crates/hir-ty/src/tests/incremental.rs
index 0fbf8acf53..3e8089c9c1 100644
--- a/crates/hir-ty/src/tests/incremental.rs
+++ b/crates/hir-ty/src/tests/incremental.rs
@@ -24,7 +24,7 @@ fn foo() -> i32 {
let crate_def_map = module.def_map(&db);
visit_module(&db, crate_def_map, module, &mut |def| {
if let ModuleDefId::FunctionId(it) = def {
- InferenceResult::for_body(&db, it.into());
+ InferenceResult::of(&db, DefWithBodyId::from(it));
}
});
},
@@ -38,17 +38,17 @@ fn foo() -> i32 {
"parse_shim",
"real_span_map_shim",
"InferenceResult::for_body_",
- "function_signature_shim",
- "function_signature_with_source_map_shim",
+ "FunctionSignature::of_",
+ "FunctionSignature::with_source_map_",
"AttrFlags::query_",
- "body_shim",
- "body_with_source_map_shim",
+ "Body::of_",
+ "Body::with_source_map_",
"trait_environment_query",
"lang_items",
"crate_lang_items",
"GenericPredicates::query_with_diagnostics_",
"ImplTraits::return_type_impl_traits_",
- "body_expr_scopes_shim",
+ "ExprScopes::body_expr_scopes_",
]
"#]],
);
@@ -69,7 +69,7 @@ fn foo() -> i32 {
let crate_def_map = module.def_map(&db);
visit_module(&db, crate_def_map, module, &mut |def| {
if let ModuleDefId::FunctionId(it) = def {
- InferenceResult::for_body(&db, it.into());
+ InferenceResult::of(&db, DefWithBodyId::from(it));
}
});
},
@@ -81,10 +81,10 @@ fn foo() -> i32 {
"file_item_tree_query",
"real_span_map_shim",
"AttrFlags::query_",
- "function_signature_with_source_map_shim",
- "function_signature_shim",
- "body_with_source_map_shim",
- "body_shim",
+ "FunctionSignature::with_source_map_",
+ "FunctionSignature::of_",
+ "Body::with_source_map_",
+ "Body::of_",
]
"#]],
);
@@ -112,7 +112,7 @@ fn baz() -> i32 {
let crate_def_map = module.def_map(&db);
visit_module(&db, crate_def_map, module, &mut |def| {
if let ModuleDefId::FunctionId(it) = def {
- InferenceResult::for_body(&db, it.into());
+ InferenceResult::of(&db, DefWithBodyId::from(it));
}
});
},
@@ -126,37 +126,37 @@ fn baz() -> i32 {
"parse_shim",
"real_span_map_shim",
"InferenceResult::for_body_",
- "function_signature_shim",
- "function_signature_with_source_map_shim",
+ "FunctionSignature::of_",
+ "FunctionSignature::with_source_map_",
"AttrFlags::query_",
- "body_shim",
- "body_with_source_map_shim",
+ "Body::of_",
+ "Body::with_source_map_",
"trait_environment_query",
"lang_items",
"crate_lang_items",
"GenericPredicates::query_with_diagnostics_",
"ImplTraits::return_type_impl_traits_",
- "body_expr_scopes_shim",
+ "ExprScopes::body_expr_scopes_",
"InferenceResult::for_body_",
- "function_signature_shim",
- "function_signature_with_source_map_shim",
+ "FunctionSignature::of_",
+ "FunctionSignature::with_source_map_",
"AttrFlags::query_",
- "body_shim",
- "body_with_source_map_shim",
+ "Body::of_",
+ "Body::with_source_map_",
"trait_environment_query",
"GenericPredicates::query_with_diagnostics_",
"ImplTraits::return_type_impl_traits_",
- "body_expr_scopes_shim",
+ "ExprScopes::body_expr_scopes_",
"InferenceResult::for_body_",
- "function_signature_shim",
- "function_signature_with_source_map_shim",
+ "FunctionSignature::of_",
+ "FunctionSignature::with_source_map_",
"AttrFlags::query_",
- "body_shim",
- "body_with_source_map_shim",
+ "Body::of_",
+ "Body::with_source_map_",
"trait_environment_query",
"GenericPredicates::query_with_diagnostics_",
"ImplTraits::return_type_impl_traits_",
- "body_expr_scopes_shim",
+ "ExprScopes::body_expr_scopes_",
]
"#]],
);
@@ -182,7 +182,7 @@ fn baz() -> i32 {
let crate_def_map = module.def_map(&db);
visit_module(&db, crate_def_map, module, &mut |def| {
if let ModuleDefId::FunctionId(it) = def {
- InferenceResult::for_body(&db, it.into());
+ InferenceResult::of(&db, DefWithBodyId::from(it));
}
});
},
@@ -194,22 +194,22 @@ fn baz() -> i32 {
"file_item_tree_query",
"real_span_map_shim",
"AttrFlags::query_",
- "function_signature_with_source_map_shim",
- "function_signature_shim",
- "body_with_source_map_shim",
- "body_shim",
+ "FunctionSignature::with_source_map_",
+ "FunctionSignature::of_",
+ "Body::with_source_map_",
+ "Body::of_",
"AttrFlags::query_",
- "function_signature_with_source_map_shim",
- "function_signature_shim",
- "body_with_source_map_shim",
- "body_shim",
+ "FunctionSignature::with_source_map_",
+ "FunctionSignature::of_",
+ "Body::with_source_map_",
+ "Body::of_",
"InferenceResult::for_body_",
- "body_expr_scopes_shim",
+ "ExprScopes::body_expr_scopes_",
"AttrFlags::query_",
- "function_signature_with_source_map_shim",
- "function_signature_shim",
- "body_with_source_map_shim",
- "body_shim",
+ "FunctionSignature::with_source_map_",
+ "FunctionSignature::of_",
+ "Body::with_source_map_",
+ "Body::of_",
]
"#]],
);
@@ -562,7 +562,7 @@ fn main() {
});
for def in defs {
- let _inference_result = InferenceResult::for_body(&db, def);
+ let _inference_result = InferenceResult::of(&db, def);
}
},
&[("trait_solve_shim", 0)],
@@ -575,19 +575,19 @@ fn main() {
"parse_shim",
"real_span_map_shim",
"TraitItems::query_with_diagnostics_",
- "body_shim",
- "body_with_source_map_shim",
+ "Body::of_",
+ "Body::with_source_map_",
"AttrFlags::query_",
"ImplItems::of_",
"InferenceResult::for_body_",
- "trait_signature_shim",
- "trait_signature_with_source_map_shim",
+ "TraitSignature::of_",
+ "TraitSignature::with_source_map_",
"AttrFlags::query_",
- "function_signature_shim",
- "function_signature_with_source_map_shim",
+ "FunctionSignature::of_",
+ "FunctionSignature::with_source_map_",
"AttrFlags::query_",
- "body_shim",
- "body_with_source_map_shim",
+ "Body::of_",
+ "Body::with_source_map_",
"trait_environment_query",
"lang_items",
"crate_lang_items",
@@ -595,14 +595,14 @@ fn main() {
"GenericPredicates::query_with_diagnostics_",
"ImplTraits::return_type_impl_traits_",
"InferenceResult::for_body_",
- "function_signature_shim",
- "function_signature_with_source_map_shim",
+ "FunctionSignature::of_",
+ "FunctionSignature::with_source_map_",
"trait_environment_query",
"GenericPredicates::query_with_diagnostics_",
"ImplTraits::return_type_impl_traits_",
- "body_expr_scopes_shim",
- "struct_signature_shim",
- "struct_signature_with_source_map_shim",
+ "ExprScopes::body_expr_scopes_",
+ "StructSignature::of_",
+ "StructSignature::with_source_map_",
"AttrFlags::query_",
"GenericPredicates::query_with_diagnostics_",
"value_ty_query",
@@ -611,8 +611,8 @@ fn main() {
"TraitImpls::for_crate_and_deps_",
"TraitImpls::for_crate_",
"impl_trait_with_diagnostics_query",
- "impl_signature_shim",
- "impl_signature_with_source_map_shim",
+ "ImplSignature::of_",
+ "ImplSignature::with_source_map_",
"impl_self_ty_with_diagnostics_query",
"AttrFlags::query_",
"GenericPredicates::query_with_diagnostics_",
@@ -658,7 +658,7 @@ fn main() {
});
for def in defs {
- let _inference_result = InferenceResult::for_body(&db, def);
+ let _inference_result = InferenceResult::of(&db, def);
}
},
&[("trait_solve_shim", 0)],
@@ -670,35 +670,35 @@ fn main() {
"real_span_map_shim",
"crate_local_def_map",
"TraitItems::query_with_diagnostics_",
- "body_with_source_map_shim",
+ "Body::with_source_map_",
"AttrFlags::query_",
- "body_shim",
+ "Body::of_",
"ImplItems::of_",
"InferenceResult::for_body_",
"AttrFlags::query_",
- "trait_signature_with_source_map_shim",
+ "TraitSignature::with_source_map_",
"AttrFlags::query_",
- "function_signature_with_source_map_shim",
- "function_signature_shim",
- "body_with_source_map_shim",
- "body_shim",
+ "FunctionSignature::with_source_map_",
+ "FunctionSignature::of_",
+ "Body::with_source_map_",
+ "Body::of_",
"crate_lang_items",
"GenericPredicates::query_with_diagnostics_",
"GenericPredicates::query_with_diagnostics_",
"ImplTraits::return_type_impl_traits_",
"InferenceResult::for_body_",
- "function_signature_with_source_map_shim",
+ "FunctionSignature::with_source_map_",
"GenericPredicates::query_with_diagnostics_",
"ImplTraits::return_type_impl_traits_",
- "body_expr_scopes_shim",
- "struct_signature_with_source_map_shim",
+ "ExprScopes::body_expr_scopes_",
+ "StructSignature::with_source_map_",
"AttrFlags::query_",
"GenericPredicates::query_with_diagnostics_",
"InherentImpls::for_crate_",
"callable_item_signature_query",
"TraitImpls::for_crate_",
- "impl_signature_with_source_map_shim",
- "impl_signature_shim",
+ "ImplSignature::with_source_map_",
+ "ImplSignature::of_",
"impl_trait_with_diagnostics_query",
"impl_self_ty_with_diagnostics_query",
"AttrFlags::query_",