[beta] [also fit for beta rollup] [HOTFIX] Don't delay a bug on malformed meta items involving interpolated tokens #140601
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 <[email protected]> (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 <[email protected]> (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
|
If I read https://forge.rust-lang.org/release/process.html correctly, then T-release will start promoting branches on Monday, May 12. So the sync procedure seems ok. In case there won't be any more beta rollups, let's prepare this PR for a solo tour. |
|
Just found this PR. Do you want to roll up Cargo beta backport #140727? |
|
@weihanglo I can create a separate beta rollup PR including this commit and the Cargo fix or cherry-pick the latter into this PR directly. However, this hotfix hasn't been officially accepted by T-compiler yet, so you'd need to wait for the T-compiler meeting happening tomorrow, Thursday afternoon UTCish if that's okay for you. |
|
I thought it has been approved 😆. I'll go ahead with a separate merge. If by that time you |
|
This was discussed in today's compiler triage meeting. The beta backport is approved, thanks! @rustbot label: +beta-accepted Not sure how release wants to handle this, cc @rust-lang/release |
rustbot
added
the
beta-accepted
|
The queue is short, it's late in the cycle, T-release has been pinged, [@]cuviper is aware of the crater regressions, the PR has been beta-accepted by T-compiler and has a separate reviewer, [@]nnethercote; I think it's fine if we go ahead and bors-approve. I don't want to bother T-release with trivial PRs like these when they're likely busy with the upcoming release. I did read https://forge.rust-lang.org/release/backporting.html#beta-backporting-in-rust-langrust but couldn't find any standard procedure for PRs like these. So I'm going by precedents like #125629 (comment). I'm sorry if I'm breaking any rules by doing this. @bors r=nnethercote |
bors
added
S-waiting-on-bors
fmease
removed
the
beta-nominated
|
@bors p=5 (beta backport) |
…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
|
☔ The latest upstream changes (presumably #140838) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
|
Unfortunately this has merge conflicts. |
bors
added
S-waiting-on-bors
|
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? |
|
Yep I'll include it. Closing this, thanks for preparing the backport! |
[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`
[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`
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