Match ergonomics 2024: mut doesn't reset binding mode
#123535
Merged
Conversation
This file contains hidden or 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
rustbot
added
S-waiting-on-review
14 tasks
This comment has been minimized.
This comment has been minimized.
Nadrieril
approved these changes
Apr 13, 2024
| @@ -529,6 +529,8 @@ declare_features! ( | |||
| (unstable, more_qualified_paths, "1.54.0", Some(86935)), | |||
| /// Allows the `#[must_not_suspend]` attribute. | |||
| (unstable, must_not_suspend, "1.57.0", Some(83310)), | |||
| /// Make `mut` not reset the binding mode on edition >= 2024. | |||
| (unstable, mut_dont_reset_binding_mode_2024, "CURRENT_RUSTC_VERSION", Some(123076)), | |||
There was a problem hiding this comment.
This should be incomplete instead of unstable
There was a problem hiding this comment.
Maybe mut_preserve_binding_mode_2024 to avoid the double negation? I'm fine either way.
compiler/rustc_hir_typeck/src/pat.rs
Outdated
Comment on lines
636
to
652
| BindingAnnotation(ByRef::No, Mutability::Not) => def_bm, | ||
| _ => ba, | ||
| BindingAnnotation(ByRef::No, Mutability::Mut) | ||
| if !(pat.span.at_least_rust_2024() | ||
| && self.tcx.features().mut_dont_reset_binding_mode_2024) | ||
| && matches!(def_br, ByRef::Yes(_)) => | ||
| { | ||
| // `mut x` resets the binding mode in edition <= 2021. | ||
| BindingAnnotation(ByRef::No, Mutability::Mut) | ||
| } | ||
| BindingAnnotation(ByRef::No, mutbl) => BindingAnnotation(def_br, mutbl), | ||
| BindingAnnotation(ByRef::Yes(_), _) => ba, |
There was a problem hiding this comment.
This doesn't preserve old behavior in the case where ba is BindingAnnotation(ByRef::No, Mutability::Not) and def_bm.1 is Mutability::Mut. I guess that can't happen, right? Could we store just a ByRef in PatInfo?
There was a problem hiding this comment.
Could we store just a
ByRefinPatInfo?
I think we can, but it would require changes to calc_default_binding_mode, so I'll do it in a later PR so as not to conflict with #123512
Nadrieril
approved these changes
Apr 13, 2024
| @@ -529,6 +529,8 @@ declare_features! ( | |||
| (unstable, more_qualified_paths, "1.54.0", Some(86935)), | |||
| /// Allows the `#[must_not_suspend]` attribute. | |||
| (unstable, must_not_suspend, "1.57.0", Some(83310)), | |||
| /// Make `mut` not reset the binding mode on edition >= 2024. | |||
| (unstable, mut_dont_reset_binding_mode_2024, "CURRENT_RUSTC_VERSION", Some(123076)), | |||
There was a problem hiding this comment.
Maybe mut_preserve_binding_mode_2024 to avoid the double negation? I'm fine either way.
Nadrieril
added
S-waiting-on-author
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
|
☔ The latest upstream changes (presumably #123991) made this pull request unmergeable. Please resolve the merge conflicts. |
Rustfix remains TODO
The lint is unstable, and the lint group `rust_2024_compatibility` must keep working on stable
Jules-Bertholet
force-pushed
the
mut_dont_reset_binding_mode_2024
branch
from
9f9b051 to
7a32117
Compare
Nadrieril
approved these changes
Apr 16, 2024
|
@bors r+ |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Apr 16, 2024
…ding_mode_2024, r=Nadrieril Match ergonomics 2024: `mut` doesn't reset binding mode r? `@Nadrieril` cc rust-lang#123076 `@rustbot` label A-edition-2024 A-patterns
This was referenced Apr 16, 2024
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 16, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#122632 (fetch submodule before checking llvm stamp) - rust-lang#123355 (Support type '/' to search) - rust-lang#123501 (Stabilize checking of cfgs at compile-time: `--check-cfg` option) - rust-lang#123535 (Match ergonomics 2024: `mut` doesn't reset binding mode) - rust-lang#123711 (drop `changelog-seen`) - rust-lang#123969 (The new solver ignores `DefineOpaqueTypes`, so switch it to `Yes`) - rust-lang#124007 (Miri subtree update) - rust-lang#124017 (Change a diagnostics-path-only `DefineOpaqueTypes` to `Yes`.) - rust-lang#124018 (interpret: pass MemoryKind to before_memory_deallocation) - rust-lang#124024 (interpret: remove outdated comment) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 16, 2024
Rollup merge of rust-lang#123535 - Jules-Bertholet:mut_dont_reset_binding_mode_2024, r=Nadrieril Match ergonomics 2024: `mut` doesn't reset binding mode r? ``@Nadrieril`` cc rust-lang#123076 ``@rustbot`` label A-edition-2024 A-patterns
6 tasks
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
r? @Nadrieril
cc #123076
@rustbot label A-edition-2024 A-patterns