Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[beta] backports #131423

Merged
merged 9 commits into from
Oct 12, 2024
Merged

[beta] backports #131423

merged 9 commits into from
Oct 12, 2024

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Oct 9, 2024 •
edited
Loading

r? ghost

@rustbot 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
Copy link
Member Author

cuviper commented Oct 9, 2024

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
Copy link
Member

jieyouxu commented Oct 9, 2024 •
edited
Loading

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

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
Copy link
Member Author

cuviper commented Oct 9, 2024

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

@cuviper cuviper mentioned this pull request Oct 9, 2024
Merged
compiler-errors and others added 3 commits October 11, 2024 08:39
@compiler-errors @cuviper
Failing diff test
692821d 
(cherry picked from commit 9c91a4e)
@compiler-errors @cuviper
Disable jump threading UnOp::Not for non-bool
0fb2b24 
(cherry picked from commit f0bfba2)
@DianQK @cuviper
Update LLVM submodule
d4b2e84 
(cherry picked from commit e1c0f04)
@cuviper
Copy link
Member Author

cuviper commented Oct 11, 2024

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Oct 11, 2024

📌 Commit d4b2e84 has been approved by cuviper

It is now in the queue for this repository.

@bors 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
@bors
Copy link
Contributor

bors commented Oct 11, 2024

⌛ Testing commit d4b2e84 with merge ba9dd66...

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 11, 2024
@bors
Auto merge of rust-lang#131423 - cuviper:beta-next, r=cuviper
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 added a commit to rust-lang-ci/rust that referenced this pull request Oct 11, 2024
@bors
Auto merge of rust-lang#131423 - cuviper:beta-next, r=cuviper
c120d96 
[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
Copy link
Contributor

bors commented Oct 11, 2024

⌛ Testing commit d4b2e84 with merge c120d96...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Oct 11, 2024

💔 Test failed - checks-actions

@bors 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
@cuviper
Copy link
Member Author

cuviper commented Oct 11, 2024

@bors retry

@bors 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
@cuviper
Copy link
Member Author

cuviper commented Oct 11, 2024

@bors p=1

@bors
Copy link
Contributor

bors commented Oct 12, 2024

⌛ Testing commit d4b2e84 with merge 0986126...

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 12, 2024
@bors
Auto merge of rust-lang#131423 - cuviper:beta-next, r=cuviper
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
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Oct 12, 2024

💔 Test failed - checks-actions

@bors 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
@tgross35
Copy link
Contributor

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

@bors retry

@bors 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
@cuviper
Copy link
Member Author

cuviper commented Oct 12, 2024

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

@tgross35
Copy link
Contributor

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

@ChrisDenton @cuviper
Split x86_64-msvc-ext into two jobs
195a9d5 
(cherry picked from commit 7358429)
@ChrisDenton @cuviper
Fix checktools.sh non-msvc builds
f07c6ac 
(cherry picked from commit 2f6307d)
@ChrisDenton @cuviper
Fix bash syntax
9bc4165 
(cherry picked from commit 0d94e6b)
@ChrisDenton @cuviper
Use small runner for msvc-ext2 job
1439844 
(cherry picked from commit ebe4fc4)
@rustbot 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
@cuviper
Copy link
Member Author

cuviper commented Oct 12, 2024

Thanks! I went ahead and backported them.

@cuviper
Copy link
Member Author

cuviper commented Oct 12, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Oct 12, 2024

📌 Commit 1439844 has been approved by cuviper

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Oct 12, 2024

⌛ Testing commit 1439844 with merge 763ad52...

@bors
Copy link
Contributor

bors commented Oct 12, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 12, 2024
@bors bors merged commit 763ad52 into rust-lang:beta Oct 12, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Oct 12, 2024
@cuviper cuviper deleted the beta-next branch October 14, 2024 00:21
@Urgau Urgau mentioned this pull request Oct 16, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.
10 participants
@cuviper @jieyouxu @bors @rust-log-analyzer @tgross35 @rustbot @Urgau @compiler-errors @DianQK @ChrisDenton