pattern_analysis: rework how we hide empty private fields #121000
Merged
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
rustbot
added
S-waiting-on-review
Nadrieril
force-pushed
the
keep_all_fields
branch
from
01a38e5
to
196b6a3
Compare
This comment was marked as resolved.
This comment was marked as resolved.
Nadrieril
force-pushed
the
keep_all_fields
branch
from
196b6a3
to
02b5f49
Compare
| /// Fake extra constructor that indicates that we should skip the column entirely. This is used | ||
| /// when a private field is empty, so that we don't observe its emptiness. Only used for | ||
| /// specialization. | ||
| Skip, |
There was a problem hiding this comment.
I wonder if we should give this a more descriptive name (PrivateUninhabited) or something
There was a problem hiding this comment.
yeah I like that, will rename
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
Nadrieril
force-pushed
the
keep_all_fields
branch
from
02b5f49
to
c918893
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
|
Ty! |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 29, 2024
…llaumeGomez Rollup of 7 pull requests Successful merges: - rust-lang#119748 (Increase visibility of `join_path` and `split_paths`) - rust-lang#120820 (Enable CMPXCHG16B, SSE3, SAHF/LAHF and 128-bit Atomics (in nightly) in Windows x64) - rust-lang#121000 (pattern_analysis: rework how we hide empty private fields) - rust-lang#121376 (Skip unnecessary comparison with half-open range patterns) - rust-lang#121596 (Use volatile access instead of `#[used]` for `on_tls_callback`) - rust-lang#121669 (Count stashed errors again) - rust-lang#121783 (Emitter cleanups) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 29, 2024
Rollup merge of rust-lang#121000 - Nadrieril:keep_all_fields, r=compiler-errors pattern_analysis: rework how we hide empty private fields Consider this: ```rust mod foo { pub struct Bar { pub a: bool, b: !, } } fn match_a_bar(bar: foo::Bar) -> bool { match bar { Bar { a, .. } => a, } } ``` Because the field `b` is private, matches outside the module are not allowed to observe the fact that `Bar` is empty. In particular `match bar {}` is valid within the module `foo` but an error outside (assuming `exhaustive_patterns`). We currently handle this by hiding the field `b` when it's both private and empty. This means that the pattern `Bar { a, .. }` is lowered to `Bar(a, _)` if we're inside of `foo` and to `Bar(a)` outside. This involves a bit of a dance to keep field indices straight. But most importantly this makes pattern lowering depend on the module. In this PR, I instead do nothing special when lowering. Only during analysis do we track whether a place must be skipped. r? `@compiler-errors`
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.
Consider this:
Because the field
bis private, matches outside the module are not allowed to observe the fact thatBaris empty. In particularmatch bar {}is valid within the modulefoobut an error outside (assumingexhaustive_patterns).We currently handle this by hiding the field
bwhen it's both private and empty. This means that the patternBar { a, .. }is lowered toBar(a, _)if we're inside offooand toBar(a)outside. This involves a bit of a dance to keep field indices straight. But most importantly this makes pattern lowering depend on the module.In this PR, I instead do nothing special when lowering. Only during analysis do we track whether a place must be skipped.
r? @compiler-errors