Do not suggest ampmut if rhs is already mutable #85823
Merged
+26
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @jackh726 (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
JohnTitor
approved these changes
Jun 11, 2021
|
Although I don't really like the string matching here, it's what been done already. So shrug @bors r+ rollup |
|
📌 Commit 0eda509 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 12, 2021
Rollup of 7 pull requests Successful merges: - rust-lang#85800 (Fix some diagnostic issues with const_generics_defaults feature gate) - rust-lang#85823 (Do not suggest ampmut if rhs is already mutable) - rust-lang#86153 (Print dummy spans as `no-location`) - rust-lang#86174 (Detect incorrect vtable alignment during const eval) - rust-lang#86189 (Make `relate_type_and_mut` public) - rust-lang#86205 (Run full const-generics test for issue-72293) - rust-lang#86217 (Remove "generic type" in boxed.rs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Jul 11, 2021
Improve error reporting for modifications behind `&` references I had a look at rust-lang#84210 and noticed that rust-lang#85823 has effectively already fixed rust-lang#84210. However, the string matching in rust-lang#85823 is _very_ crude and already breaks down when a variable name starts with `mut`. I have made this a bit more robust; further improvements could definitely be made but are complicated by the lack of information provided by an earlier pass: https://github.com/rust-lang/rust/blob/ce331ee6ee010438d1a58c7da8ced4f26d69a20e/compiler/rustc_mir_build/src/build/matches/mod.rs#L2103-L2107 I have also fixed a missing comma in the error message.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 12, 2021
Improve error reporting for modifications behind `&` references I had a look at rust-lang#84210 and noticed that rust-lang#85823 has effectively already fixed rust-lang#84210. However, the string matching in rust-lang#85823 is _very_ crude and already breaks down when a variable name starts with `mut`. I have made this a bit more robust; further improvements could definitely be made but are complicated by the lack of information provided by an earlier pass: https://github.com/rust-lang/rust/blob/ce331ee6ee010438d1a58c7da8ced4f26d69a20e/compiler/rustc_mir_build/src/build/matches/mod.rs#L2103-L2107 I have also fixed a missing comma in the error message.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removes invalid suggestion in #85765, although it should highlight the user type instead of the local variable.
Looking at the comments of this line:
rust/compiler/rustc_mir_build/src/build/matches/mod.rs
Line 2107 in 84b1005
It was intentionally set to
None, causing it to highlight the local variable instead. I am not sure if I will be able to fix it.Fixes #85765