Skip to content

Suggest use .get_mut instead of &mut when occur HashMap and BtreeMap #144018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Suggest use .get_mut instead of &mut when occur HashMap and BtreeMap #144018

wants to merge 2 commits into from
+99 −0

Conversation

xizheyin
Copy link
Contributor

@xizheyin xizheyin commented Jul 16, 2025 •
edited by rustbot
Loading

Fixes #143732

r? compiler

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 16, 2025
@fee1-dead
Copy link
Member

You need to compare the defid with the defid of the HashMap/BTreeMap diagnostic item and hard code the special case

@xizheyin xizheyin changed the title Suggest use .get_mut instead of &mut when occur overloaded index expression Suggest use .get_mut instead of &mut when occur HashMap and BtreeMap Jul 16, 2025
xizheyin
xizheyin commented Jul 16, 2025
View reviewed changes
Copy link
Contributor Author

@xizheyin xizheyin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The second commit shows the testcase difference.

xizheyin
xizheyin commented Jul 16, 2025
View reviewed changes
compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs
Comment on lines +1437 to +1446
}) = self.body[location.block].statements.get(location.statement_index)
&& let BorrowedContentSource::OverloadedIndex(ty) =
self.borrowed_content_source(place.as_ref())
&& let Some(def) = ty.ty_adt_def()
&& (self.infcx.tcx.is_diagnostic_item(sym::HashMap, def.did())
|| self.infcx.tcx.is_diagnostic_item(sym::BTreeMap, def.did()))
{
true
} else {
false
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this version, I hard code HashMap and BTreeMap using judge def_id of the borrwoed_content_source's ty.

@Kobzol Kobzol mentioned this pull request Jul 16, 2025
Open
@fee1-dead
Copy link
Member

fee1-dead commented Jul 17, 2025 •
edited
Loading

In your first version you checked if the assignment on the type came from an overloaded index. You should check whether the overloaded index type implements IndexMut and return instead of passing the bool into the suggest_ampmut function if they don't implement IndexMut, then before returning you can suggest get_mut

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 17, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jul 17, 2025

Reminder, once the PR becomes ready for a review, use @rustbot ready.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@fee1-dead fee1-dead

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

rust suggests using IndexMut for maps, even though they don't implement the trait
3 participants
@xizheyin @fee1-dead @rustbot