[beta] backports by cuviper · Pull Request #131423 · rust-lang/rust

cuviper · 2024-10-09T00:47:19Z

Only add an automatic SONAME for Rust dylibs Only add an automatic SONAME for Rust dylibs #130960
Reject leading unsafe in cfg!(...) and --check-cfg Reject leading unsafe in cfg!(...) and --check-cfg #131057, resolving cfg!(unsafe(foo)) and --check-cfg=unsafe(cfg(foo)) are erroneously accepted on beta #131055
Disable jump threading UnOp::Not for non-bool Disable jump threading UnOp::Not for non-bool #131201
Update LLVM submodule Update LLVM submodule #131448
Split x86_64-msvc-ext into two jobs Split x86_64-msvc-ext into two jobs #130072
Use a small runner for msvc-ext2 job Use a small runner for msvc-ext2 job #130151

r? ghost

(cherry picked from commit f46057b)

(cherry picked from commit 9cb540a)

cuviper · 2024-10-09T00:49:27Z

There are a couple more nominated backports as well, so I'll hold off a few days in case they're accepted...
https://github.com/rust-lang/rust/pulls?q=is%3Apr+is%3Aclosed+label%3Abeta-nominated

jieyouxu · 2024-10-09T01:36:02Z

@cuviper the passing current cargo to run-make one (#130642) is kind of funny, because:

That PR alone builds an off-by-one stage cargo: fixed in Fix cargo staging for run-make tests #130739
But Fix cargo staging for run-make tests #130739 alone will lead to unnecessary stage 1 cargo rebuilds: fixed in Prevent building cargo from invalidating build cache of other tools due to conditionally applied -Zon-broken-pipe=kill via tracked RUSTFLAGS #131155

You previously said

I already worked around the problem on beta by marking those tests only-nightly, but we can revert that if we backport this as a better fix.

So if #130642 isn't necessary, I would recommend not backporting it.

cuviper · 2024-10-09T01:40:25Z

Yeah, I agree we probably don't need #130642, and I forgot that I nominated it myself 😬 -- I'll drop that.

(cherry picked from commit 9c91a4e)

(cherry picked from commit f0bfba2)

(cherry picked from commit e1c0f04)

cuviper · 2024-10-11T17:16:50Z

@bors r+ rollup=never

bors · 2024-10-11T17:16:52Z

📌 Commit d4b2e84 has been approved by cuviper

It is now in the queue for this repository.

bors · 2024-10-11T19:32:59Z

⌛ Testing commit d4b2e84 with merge ba9dd66...

[beta] backports - Only add an automatic SONAME for Rust dylibs rust-lang#130960 - Reject leading unsafe in `cfg!(...)` and `--check-cfg` rust-lang#131057, resolving rust-lang#131055 - Disable jump threading `UnOp::Not` for non-bool rust-lang#131201 - Update LLVM submodule rust-lang#131448 r? ghost

bors · 2024-10-11T19:38:18Z

⌛ Testing commit d4b2e84 with merge c120d96...

bors · 2024-10-11T21:23:28Z

💔 Test failed - checks-actions

cuviper · 2024-10-11T21:25:25Z

@bors retry

cuviper · 2024-10-11T22:25:56Z

@bors p=1

bors · 2024-10-12T02:25:34Z

⌛ Testing commit d4b2e84 with merge 0986126...

[beta] backports - Only add an automatic SONAME for Rust dylibs rust-lang#130960 - Reject leading unsafe in `cfg!(...)` and `--check-cfg` rust-lang#131057, resolving rust-lang#131055 - Disable jump threading `UnOp::Not` for non-bool rust-lang#131201 - Update LLVM submodule rust-lang#131448 r? ghost

bors · 2024-10-12T04:09:56Z

💔 Test failed - checks-actions

tgross35 · 2024-10-12T04:13:45Z

Oh - do we not have the mitigations for the MSVC failure on the beta branch?

@bors retry

cuviper · 2024-10-12T04:17:14Z

What's the mitigation? I should probably backport it too.

tgross35 · 2024-10-12T04:25:00Z

I think currently we have #130151 and #130072 (cc @ChrisDenton)

(cherry picked from commit 7358429)

(cherry picked from commit 2f6307d)

(cherry picked from commit 0d94e6b)

(cherry picked from commit ebe4fc4)

cuviper · 2024-10-12T04:55:40Z

Thanks! I went ahead and backported them.

cuviper · 2024-10-12T04:56:26Z

@bors r+

bors · 2024-10-12T04:56:28Z

📌 Commit 1439844 has been approved by cuviper

It is now in the queue for this repository.

bors · 2024-10-12T05:42:27Z

⌛ Testing commit 1439844 with merge 763ad52...

bors · 2024-10-12T08:30:35Z

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 763ad52 to beta...

cuviper and others added 2 commits October 8, 2024 17:34

Only add an automatic SONAME for Rust dylibs

6917db6

(cherry picked from commit f46057b)

Reject leading unsafe in cfg!(...) and --check-cfg.

3fb4ade

(cherry picked from commit 9cb540a)

rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 9, 2024

cuviper mentioned this pull request Oct 9, 2024

Pass the current cargo to run-make tests #130642

Merged

compiler-errors and others added 3 commits October 11, 2024 08:39

Failing diff test

692821d

(cherry picked from commit 9c91a4e)

Disable jump threading UnOp::Not for non-bool

0fb2b24

(cherry picked from commit f0bfba2)

Update LLVM submodule

d4b2e84

(cherry picked from commit e1c0f04)

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 11, 2024

This comment has been minimized.

Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 11, 2024

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 11, 2024

This comment has been minimized.

Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 12, 2024

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 12, 2024

ChrisDenton added 4 commits October 11, 2024 21:52

Split x86_64-msvc-ext into two jobs

195a9d5

(cherry picked from commit 7358429)

Fix checktools.sh non-msvc builds

f07c6ac

(cherry picked from commit 2f6307d)

Fix bash syntax

9bc4165

(cherry picked from commit 0d94e6b)

Use small runner for msvc-ext2 job

1439844

(cherry picked from commit ebe4fc4)

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Oct 12, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 12, 2024

bors merged commit 763ad52 into rust-lang:beta Oct 12, 2024

rustbot added this to the 1.82.0 milestone Oct 12, 2024

cuviper deleted the beta-next branch October 14, 2024 00:21

Urgau mentioned this pull request Oct 16, 2024

cfg!(unsafe(foo)) and --check-cfg=unsafe(cfg(foo)) are erroneously accepted on beta #131055

Closed

Uh oh!

Conversation

cuviper commented Oct 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cuviper commented Oct 9, 2024

Uh oh!

jieyouxu commented Oct 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cuviper commented Oct 9, 2024

Uh oh!

cuviper commented Oct 11, 2024

Uh oh!

bors commented Oct 11, 2024

Uh oh!

bors commented Oct 11, 2024

Uh oh!

bors commented Oct 11, 2024

Uh oh!

This comment has been minimized.

bors commented Oct 11, 2024

Uh oh!

cuviper commented Oct 11, 2024

Uh oh!

cuviper commented Oct 11, 2024

Uh oh!

bors commented Oct 12, 2024

Uh oh!

This comment has been minimized.

bors commented Oct 12, 2024

Uh oh!

tgross35 commented Oct 12, 2024

Uh oh!

cuviper commented Oct 12, 2024

Uh oh!

tgross35 commented Oct 12, 2024

Uh oh!

cuviper commented Oct 12, 2024

Uh oh!

cuviper commented Oct 12, 2024

Uh oh!

bors commented Oct 12, 2024

Uh oh!

bors commented Oct 12, 2024

Uh oh!

bors commented Oct 12, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

cuviper commented Oct 9, 2024 •

edited

Loading

jieyouxu commented Oct 9, 2024 •

edited

Loading