Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-15 06:33:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Record method resolution for index expressions

Browse source
This commit is contained in:
Lukas Wirth 2023-01-27 11:15:05 +01:00
parent 54da0bfbf0
commit a7f81e3cdc
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/hir-ty/src/infer/expr.rs
View file

@ -17,7 +17,7 @@ use hir_def::{
resolver::resolver_for_expr, resolver::resolver_for_expr,
ConstParamId, FieldId, ItemContainerId, Lookup, ConstParamId, FieldId, ItemContainerId, Lookup,
}; };
use hir_expand::name::Name; use hir_expand::name::{name, Name};
use stdx::always; use stdx::always;
use syntax::ast::RangeOp; use syntax::ast::RangeOp;
@ -741,7 +741,6 @@ impl<'a> InferenceContext<'a> {
} }
} }
Expr::Index { base, index } => { Expr::Index { base, index } => {
// FIXME: note down method resolution for the `index`/`index_mut` function
let base_ty = self.infer_expr_inner(*base, &Expectation::none()); let base_ty = self.infer_expr_inner(*base, &Expectation::none());
let index_ty = self.infer_expr(*index, &Expectation::none()); let index_ty = self.infer_expr(*index, &Expectation::none());
@ -758,6 +757,15 @@ impl<'a> InferenceContext<'a> {
adj.apply(&mut self.table, base_ty) adj.apply(&mut self.table, base_ty)
}); });
self.write_expr_adj(*base, adj); self.write_expr_adj(*base, adj);
if let Some(func) =
self.db.trait_data(index_trait).method_by_name(&name!(index))
{
let substs = TyBuilder::subst_for_def(self.db, index_trait, None)
.push(self_ty.clone())
.push(index_ty.clone())
.build();
self.write_method_resolution(tgt_expr, func, substs.clone());
}
self.resolve_associated_type_with_params( self.resolve_associated_type_with_params(
self_ty, self_ty,
self.resolve_ops_index_output(), self.resolve_ops_index_output(),

6
crates/hir-ty/src/tests/traits.rs
View file

@ -2295,10 +2295,8 @@ fn unselected_projection_in_trait_env_no_cycle() {
// this is not a cycle // this is not a cycle
check_types( check_types(
r#" r#"
//- /main.rs //- minicore: index
trait Index { use core::ops::Index;
type Output;
}
type Key<S: UnificationStoreBase> = <S as UnificationStoreBase>::Key; type Key<S: UnificationStoreBase> = <S as UnificationStoreBase>::Key;