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

Prevent redundant obigation push for assignee exprs

Browse source
This commit is contained in:
Shoyu Vanilla 2024-08-01 02:51:33 +09:00
parent 20e2623234
commit b5494d7cc3
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -104,7 +104,7 @@ impl InferenceContext<'_> {
Expr::RecordLit { path: _, fields, spread, ellipsis: _, is_assignee_expr: _ } => { Expr::RecordLit { path: _, fields, spread, ellipsis: _, is_assignee_expr: _ } => {
self.infer_mut_not_expr_iter(fields.iter().map(|it| it.expr).chain(*spread)) self.infer_mut_not_expr_iter(fields.iter().map(|it| it.expr).chain(*spread))
} }
&Expr::Index { base, index, is_assignee_expr: _ } => { &Expr::Index { base, index, is_assignee_expr } => {
if mutability == Mutability::Mut { if mutability == Mutability::Mut {
if let Some((f, _)) = self.result.method_resolutions.get_mut(&tgt_expr) { if let Some((f, _)) = self.result.method_resolutions.get_mut(&tgt_expr) {
if let Some(index_trait) = self if let Some(index_trait) = self
@ -129,12 +129,16 @@ impl InferenceContext<'_> {
target, target,
}) = base_adjustments }) = base_adjustments
{ {
*mutability = Mutability::Mut; // For assignee exprs `IndexMut` obiligations are already applied
if let TyKind::Ref(_, _, ty) = target.kind(Interner) { if !is_assignee_expr {
base_ty = Some(ty.clone()); if let TyKind::Ref(_, _, ty) = target.kind(Interner) {
base_ty = Some(ty.clone());
}
} }
*mutability = Mutability::Mut;
} }
// Apply `IndexMut` obligation for non-assignee expr
if let Some(base_ty) = base_ty { if let Some(base_ty) = base_ty {
let index_ty = let index_ty =
if let Some(ty) = self.result.type_of_expr.get(index) { if let Some(ty) = self.result.type_of_expr.get(index) {