Apply Recovery::Forbidden when reparsing pasted macro fragments.#139341
Merged
bors merged 2 commits intorust-lang:masterfrom Apr 5, 2025
Merged
Apply Recovery::Forbidden when reparsing pasted macro fragments.#139341bors merged 2 commits intorust-lang:masterfrom
Recovery::Forbidden when reparsing pasted macro fragments.#139341bors merged 2 commits intorust-lang:masterfrom
Conversation
I accidentally added this in rust-lang#138740.
Contributor
Author
|
This is the exact spot where the problem was occurring: rust/compiler/rustc_parse/src/parser/pat.rs Lines 794 to 804 in 00095b3 The |
This comment has been minimized.
This comment has been minimized.
Fixes rust-lang#137874. Removes `tests/crashes/137874.rs`; the new test is simpler (defines its own macro) but tests the same thing. The changes to the output of `tests/ui/associated-consts/issue-93835.rs` partly undo the changes seen when `NtTy` was removed in rust-lang#133436, which is good.
Collaborator
|
This PR changes a file inside |
Contributor
|
@bors r+ |
Collaborator
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Apr 4, 2025
…nkov Apply `Recovery::Forbidden` when reparsing pasted macro fragments. Fixes rust-lang#137874. The changes to the output of `tests/ui/associated-consts/issue-93835.rs` partly undo the changes seen when `NtTy` was removed in rust-lang#133436, which is good. r? `@petrochenkov`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 5, 2025
Rollup of 11 pull requests Successful merges: - rust-lang#136457 (Expose algebraic floating point intrinsics) - rust-lang#137880 (Autodiff batching) - rust-lang#137897 (fix pthread-based tls on apple targets) - rust-lang#138024 (Allow optimizing out `panic_bounds_check` in Unicode checks.) - rust-lang#138546 (Add integer to string formatting tests) - rust-lang#138826 (StableMIR: Add `associated_items`.) - rust-lang#138950 (replace extra_filename with strict version hash in metrics file names) - rust-lang#139274 (Rustdoc: typecheck settings.js) - rust-lang#139285 (use lower case to match other error messages) - rust-lang#139341 (Apply `Recovery::Forbidden` when reparsing pasted macro fragments.) - rust-lang#139389 (make `Arguments::as_statically_known_str` doc(hidden)) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 5, 2025
Rollup merge of rust-lang#139341 - nnethercote:fix-137874, r=petrochenkov Apply `Recovery::Forbidden` when reparsing pasted macro fragments. Fixes rust-lang#137874. The changes to the output of `tests/ui/associated-consts/issue-93835.rs` partly undo the changes seen when `NtTy` was removed in rust-lang#133436, which is good. r? ``@petrochenkov``
cuviper
added a commit
to cuviper/rust
that referenced
this pull request
Apr 24, 2025
Beta-backporting rust-lang#140228 has the same effect on this test as rust-lang#139341 already had on master.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
Fixes #137874.
The changes to the output of
tests/ui/associated-consts/issue-93835.rspartly undo the changes seen when
NtTywas removed in #133436, whichis good.
r? @petrochenkov