Allow for reparsing failure when reparsing a pasted metavar. #139464
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
|
@bors try |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 7, 2025
…5, r=<try> Allow for reparsing failure when reparsing a pasted metavar. Allow for reparsing failure when reparsing a pasted metavar. Fixes rust-lang#139445. The additional errors aren't great but the first one is still good and it's the most important, and imperfect errors are better than ICEing. r? `@petrochenkov`
|
☀️ Try build successful - checks-actions |
petrochenkov
reviewed
Apr 7, 2025
petrochenkov
added
S-waiting-on-author
This can happen when invalid syntax is passed to a declarative macro. We shouldn't be too strict about the token stream position once the parser has rejected the invalid syntax. Fixes rust-lang#139248.
Fixes rust-lang#139445. The additional errors aren't great but the first one is still good and it's the most important, and imperfect errors are better than ICEing.
nnethercote
force-pushed
the
fix-139248-AND-fix-139445
branch
from
2d59c6b to
e177921
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 8, 2025
Rollup of 10 pull requests Successful merges: - rust-lang#138676 (Implement overflow for infinite implied lifetime bounds) - rust-lang#139024 (Make error message for missing fields with `..` and without `..` more consistent) - rust-lang#139098 (Tell LLVM about impossible niche tags) - rust-lang#139124 (compiler: report error when trait object type param reference self) - rust-lang#139321 (Update to new rinja version (askama)) - rust-lang#139346 (Don't construct preds w escaping bound vars in `diagnostic_hir_wf_check`) - rust-lang#139386 (make it possible to use stage0 libtest on compiletest) - rust-lang#139421 (Fix trait upcasting to dyn type with no principal when there are projections) - rust-lang#139464 (Allow for reparsing failure when reparsing a pasted metavar.) - rust-lang#139490 (Update some comment/docs related to "extern intrinsic" removal) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 8, 2025
Rollup merge of rust-lang#139464 - nnethercote:fix-139248-AND-fix-139445, r=petrochenkov Allow for reparsing failure when reparsing a pasted metavar. Fix some metavar reparsing issues. Fixes rust-lang#139248 and rust-lang#139445. r? `@petrochenkov`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Fix some metavar reparsing issues.
Fixes #139248 and #139445.
r? @petrochenkov