[beta] [also fit for beta rollup] [HOTFIX] Don't delay a bug on malformed meta items involving interpolated tokens#140601
Closed
fmease wants to merge 26 commits intorust-lang:betafrom
Closed
Conversation
[beta] Prepare Rust 1.87.0 r? ghost
[beta] bump stage0
…nglo [beta-1.87] Update cargo 1 commits in a6c604d1b8a2f2a8ff1f3ba6092f9fda42f4b7e9..202515849e943032d8fdd3eba57bf2c86e0da736 2025-03-26 18:11:00 +0000 to 2025-04-06 19:30:58 -0400 - [beta-1.87] chore: Bump cargo-util-schemas to 0.8.1 (rust-lang/cargo#15402) r? ghost
This reverts commit 60e4a1b.
[beta] Revert "Remove `prev_index_to_index` field from `CurrentDepGraph`" This reverts rust-lang#138824 on beta to fix issues with incremental compilation in that PR. rust-lang#139410 will fix these on master. r? `@oli-obk`
(cherry picked from commit a91e97c)
(cherry picked from commit fff2484)
(cherry picked from commit f9927ee)
(cherry picked from commit cfcc47e)
Signed-off-by: Petros Angelatos <petrosagg@gmail.com> (cherry picked from commit 9eb6a54)
This PR is fixing a regression introduced by rust-lang#121646 that can lead to a double free when dropping the channel. The details of the bug can be found in the corresponding crossbeam PR crossbeam-rs/crossbeam#1187 Signed-off-by: Petros Angelatos <petrosagg@gmail.com> (cherry picked from commit b9e2ac5)
[beta] backports - Fix 2024 edition doctest panic output rust-lang#139328 - make `Arguments::as_statically_known_str` doc(hidden) rust-lang#139389 - Revert "Deduplicate template parameter creation" rust-lang#139878 - sync::mpsc: prevent double free on `Drop` rust-lang#139553 r? cuviper
…g param-env for receiver_is_dispatchable (cherry picked from commit 4f2baaa)
This commit fixes a false positive of the warning triggered for rust-lang#138762 and the fix is to codify that zero-sized types are "safe" in both the old and new ABIs. (cherry picked from commit f9091e2)
This has other warnings if necessary and doesn't need extra warnings from this FCW. cc rust-lang#138762 (cherry picked from commit 19e44d4)
(cherry picked from commit 16da97b)
Beta-backporting rust-lang#140228 has the same effect on this test as rust-lang#139341 already had on master.
[beta] backports - Do not mix normalized and unnormalized caller bounds when constructing param-env for `receiver_is_dispatchable` rust-lang#138941 - Ignore zero-sized types in wasm future-compat warning rust-lang#139498 - Don't warn about `v128` in wasm ABI transition rust-lang#139809 - Revert overzealous parse recovery for single colons in paths rust-lang#140228 r? cuviper
[beta] Delay `hash_extract_if` stabilization from 1.87 to 1.88 This PR is a revert of: - rust-lang#134655 for use in the event that we are unable to get rust-lang#139764 into 1.87 (current beta).
fmease
added
beta-nominated
Collaborator
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 9, 2025
…olated_BETA, r=nnethercote [beta] [also fit for beta rollup] [HOTFIX] Don't delay a bug on malformed meta items involving interpolated tokens Directly fixes rust-lang#140612. <details><summary>Outdated Information</summary> Directly fixes the 3 crater regressions reported in rust-lang#137687 (comment) (NB: The containing issue rust-lang#137687 is in fact *not* an instance of these regressions, see rust-lang#137687 (comment)). </details> **Why is this a separate PR for `beta`**? Well, the crater regressions were already fixed on master albeit unintentionally so, namely by PR rust-lang#124141 which we **certainly** don't want to backport! So this is simply a hotfix. PR rust-lang#140584 will then provide the regression test for master, too, so it doesn't get 'lost'. [`@]T-release,` if/once accepted by T-compiler, this PR will be fit for beta rollup and can be cherry-picked. <details><summary>Slightly Outdated & Irrelevant Information</summary> FYI, we may also want to (separately) backport PR rust-lang#140584 to [fix] rust-lang#137687 (which, again, is not an instance of the crater regressions) but it's unclear if it's really necessary (since it's fuzzer-generated and I don't know of any real users who are impacted). </details> cc `@jdonszelmann` r? fmease
Collaborator
|
☔ The latest upstream changes (presumably #140838) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
Member
|
Unfortunately this has merge conflicts. |
bors
added
S-waiting-on-bors
Member
Author
|
Nah, channel promotion just happened. This PR would now need to target stable IIUC. CC #t-release > 1.87.0 @ 💬 Looks like @pietroalbini will include it in the [stable] PR? |
Member
|
Yep I'll include it. Closing this, thanks for preparing the backport! |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 9, 2025
[stable] Prepare the 1.87.0 release Preparing the stable artifacts as described in the release process. This PR also includes the following last minute backports: * rust-lang#140810 * rust-lang#140601 * rust-lang#140684 r? `@ghost`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 9, 2025
[stable] Prepare the 1.87.0 release Preparing the stable artifacts as described in the release process. This PR also includes the following last minute backports: * rust-lang#140810 * rust-lang#140601 * rust-lang#140684 r? `@ghost`
Kobzol
added a commit
to Kobzol/rust
that referenced
this pull request
Aug 12, 2025
…, r=jdonszelmann Add regression test for former ICE involving malformed meta items containing interpolated tokens Add regression test for rust-lang#140612 from rust-lang#140601 or rather rust-lang#140859 that only added it to `stable` not `master`. Supersedes rust-lang#140584. r? `@jdonszelmann` or anyone
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Aug 12, 2025
…, r=jdonszelmann Add regression test for former ICE involving malformed meta items containing interpolated tokens Add regression test for rust-lang#140612 from rust-lang#140601 or rather rust-lang#140859 that only added it to `stable` not `master`. Supersedes rust-lang#140584. r? ``@jdonszelmann`` or anyone
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Aug 12, 2025
…, r=jdonszelmann Add regression test for former ICE involving malformed meta items containing interpolated tokens Add regression test for rust-lang#140612 from rust-lang#140601 or rather rust-lang#140859 that only added it to `stable` not `master`. Supersedes rust-lang#140584. r? ```@jdonszelmann``` or anyone
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Aug 12, 2025
…, r=jdonszelmann Add regression test for former ICE involving malformed meta items containing interpolated tokens Add regression test for rust-lang#140612 from rust-lang#140601 or rather rust-lang#140859 that only added it to `stable` not `master`. Supersedes rust-lang#140584. r? ````@jdonszelmann```` or anyone
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Aug 13, 2025
…, r=jdonszelmann Add regression test for former ICE involving malformed meta items containing interpolated tokens Add regression test for rust-lang#140612 from rust-lang#140601 or rather rust-lang#140859 that only added it to `stable` not `master`. Supersedes rust-lang#140584. r? `````@jdonszelmann````` or anyone
jdonszelmann
added a commit
to jdonszelmann/rust
that referenced
this pull request
Aug 13, 2025
…, r=jdonszelmann Add regression test for former ICE involving malformed meta items containing interpolated tokens Add regression test for rust-lang#140612 from rust-lang#140601 or rather rust-lang#140859 that only added it to `stable` not `master`. Supersedes rust-lang#140584. r? ``````@jdonszelmann`````` or anyone
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Aug 13, 2025
…, r=jdonszelmann Add regression test for former ICE involving malformed meta items containing interpolated tokens Add regression test for rust-lang#140612 from rust-lang#140601 or rather rust-lang#140859 that only added it to `stable` not `master`. Supersedes rust-lang#140584. r? ```````@jdonszelmann``````` or anyone
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Aug 13, 2025
…, r=jdonszelmann Add regression test for former ICE involving malformed meta items containing interpolated tokens Add regression test for rust-lang#140612 from rust-lang#140601 or rather rust-lang#140859 that only added it to `stable` not `master`. Supersedes rust-lang#140584. r? ````````@jdonszelmann```````` or anyone
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Aug 14, 2025
…, r=jdonszelmann Add regression test for a former ICE involving helper attributes containing interpolated tokens Add regression test for rust-lang#140612 from rust-lang#140601 or rather rust-lang#140859 that only added it to `stable` not `master`. Supersedes rust-lang#140584. r? `@jdonszelmann` or anyone
rust-timer
added a commit
that referenced
this pull request
Aug 14, 2025
Rollup merge of #145250 - fmease:regr-test-for-attr-meta-ice, r=jdonszelmann Add regression test for a former ICE involving helper attributes containing interpolated tokens Add regression test for #140612 from #140601 or rather #140859 that only added it to `stable` not `master`. Supersedes #140584. r? `@jdonszelmann` or anyone
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Aug 15, 2025
…zelmann Add regression test for a former ICE involving helper attributes containing interpolated tokens Add regression test for rust-lang/rust#140612 from rust-lang/rust#140601 or rather rust-lang/rust#140859 that only added it to `stable` not `master`. Supersedes rust-lang/rust#140584. r? `@jdonszelmann` or anyone
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
19 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.
Directly fixes #140612.
Outdated Information
Directly fixes the 3 crater regressions reported in #137687 (comment) (NB: The containing issue #137687 is in fact not an instance of these regressions, see #137687 (comment)).
Why is this a separate PR for
beta? Well, the crater regressions were already fixed on master albeit unintentionally so, namely by PR #124141 which we certainly don't want to backport! So this is simply a hotfix. PR #140584 will then provide the regression test for master, too, so it doesn't get 'lost'.[@]T-release, if/once accepted by T-compiler, this PR will be fit for beta rollup and can be cherry-picked.
Slightly Outdated & Irrelevant Information
FYI, we may also want to (separately) backport PR #140584 to [fix] #137687 (which, again, is not an instance of the crater regressions) but it's unclear if it's really necessary (since it's fuzzer-generated and I don't know of any real users who are impacted).
cc @jdonszelmann
r? fmease