_match.rs: prune sub-match tree too aggressively #13034
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
| let m2 = const_eval::compare_lit_exprs(tcx, a2, b_expr); | ||
| match (m1, m2) { | ||
| // b is in range [a1, a2] iff a1 <= b and b <= a2 | ||
| (Some(val1), Some(val2)) => (val1 <= 0 && 0 <= val2), |
There was a problem hiding this comment.
Oh, does compare_lit_exprs return -1, 0 or 1? How peculiar.
There was a problem hiding this comment.
Yes, it does that like Java did :)
There was a problem hiding this comment.
Don't we have an Ordering enum just for this?
There was a problem hiding this comment.
Ah, val1 <= Equal && Equal <= val2 that'll be more readable.
|
After reading into the code, I don't think this is the right answer. I wrote details (a lot more details) here: #13027 (comment) |
edwardw
changed the title
|
r? |
|
(r+ with a comment, in case that was unclear) |
The `_match.rs` takes advantage of passes prior to `trans` and aggressively prunes the sub-match tree based on exact equality. When it comes to literal or range, the strategy may lead to wrong result if there's guard function or multiple patterns inside tuple. Closes rust-lang#12582. Closes rust-lang#13027.
edwardw
added a commit
to edwardw/rust
that referenced
this pull request
May 5, 2014
It has been found that rust-lang#13034 was flawed and caused regression rust-lang#13867. This patch reveres the changes made by it except the companion tests.
lnicola
pushed a commit
to lnicola/rust
that referenced
this pull request
Aug 23, 2022
fix: escape keywords used as names in earlier editions Fixes rust-lang#13030 There are keywords in Rust 2018+ that you can use as names without escaping when your crate is in Rust 2015 e.g. "try". We need to be consistent on how to keep track of the names regardless of how they are actually written in each crate. This patch attempts at it by taking such names into account and storing them uniformly in their escaped form.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 20, 2023
…, r=Veykril fix: Search raw identifiers without prefix When we find references/usages of a raw identifier, we should disregard `r#` prefix because there are keywords one can use without the prefix in earlier editions (see rust-lang#13034; this bug is actually fallout from the PR). `name`, the text we're searching for, has already been stripped of the prefix, but the text of nodes we compare it to hasn't been. The second commit is strictly refactoring, I can remove it if it's not much of value.
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.
The
_match.rstakes advantage of passes prior totransandaggressively prunes the sub-match tree based on exact equality. When it
comes to literal or range, the strategy may lead to wrong result if
there's guard function or multiple patterns inside tuple.
Closes #12582.
Closes #13027.