Skip to content

[beta] backports#123801

Merged
bors merged 7 commits intorust-lang:betafrom
cuviper:beta-next
Apr 12, 2024
Merged

[beta] backports#123801
bors merged 7 commits intorust-lang:betafrom
cuviper:beta-next

Conversation

@cuviper
Copy link
Member

@cuviper cuviper commented Apr 11, 2024

r? cuviper

gvozdvmozgu and others added 7 commits April 11, 2024 08:30
@gvozdvmozgu @cuviper
fix attribute validation on associated items in traits
e9f44b3 
(cherry picked from commit 8b576d5)
@oli-obk @cuviper
Add regression test
0ac7d33 
(cherry picked from commit 769ab55)
@oli-obk @cuviper
Only inspect user-written predicates for privacy concerns
5d40b80 
(cherry picked from commit 83bd12c)
@compiler-errors @cuviper
Check def id before calling match_projection_projections
3b4de3d 
(cherry picked from commit 43dae69)
@lqd @cuviper
add non-regression test for issue 123275
9cf0875 
(cherry picked from commit 54f8db8)
@lqd @cuviper
Revert "remove pred_known_to_hold_modulo_regions"
db57812 
This reverts commit 399a258.

(cherry picked from commit 68b4257)
@ChrisDenton @cuviper
Beta revert "Use OS thread name by default"
3e37631 
This reverts rust-lang#121666 due to rust-lang#123495

This has already been done on master but beta needs something that will backport cleanly.

(cherry picked from commit 081ad85)
@rustbot
Copy link
Collaborator

rustbot commented Apr 11, 2024

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rustbot rustbot added O-hermit Operating System: Hermit O-itron Operating System: ITRON O-SGX Target: SGX O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-wasm Target: WASM (WebAssembly), http://webassembly.org/ O-windows Operating system: Windows 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Apr 11, 2024
@cuviper cuviper mentioned this pull request Apr 11, 2024
Closed
@cuviper
Copy link
Member Author

cuviper commented Apr 11, 2024

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Apr 11, 2024

📌 Commit 3e37631 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 Apr 11, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2024
@bors
Auto merge of rust-lang#123801 - cuviper:beta-next, r=cuviper
b8e8193 
[beta] backports

- fix attribute validation on associated items in traits rust-lang#121545
- Only inspect user-written predicates for privacy concerns rust-lang#123377
- Check def id before calling `match_projection_projections` rust-lang#123471
- Restore `pred_known_to_hold_modulo_regions` rust-lang#123578
- Beta revert "Use OS thread name by default" rust-lang#123533

r? cuviper
@bors
Copy link
Collaborator

bors commented Apr 12, 2024

⌛ Testing commit 3e37631 with merge b8e8193...

@bors
Copy link
Collaborator

bors commented Apr 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 Apr 12, 2024
@rust-log-analyzer
Copy link
Collaborator

rust-log-analyzer commented Apr 12, 2024

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
  AWS_REGION: us-west-1
  CACHE_DOMAIN: ci-caches.rust-lang.org
  IMAGE: aarch64-gnu
##[endgroup]
##[error]Process completed with exit code 143.
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.

@cuviper
Copy link
Member Author

cuviper commented Apr 12, 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 Apr 12, 2024
@bors
Copy link
Collaborator

bors commented Apr 12, 2024

⌛ Testing commit 3e37631 with merge 6fd1912...

@bors
Copy link
Collaborator

bors commented Apr 12, 2024

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 6fd1912 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 12, 2024
@bors bors merged commit 6fd1912 into rust-lang:beta Apr 12, 2024
@rustbot rustbot added this to the 1.78.0 milestone Apr 12, 2024
This was referenced Apr 12, 2024
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@cuviper cuviper

Labels

merged-by-bors This PR was explicitly merged by bors. O-hermit Operating System: Hermit O-itron Operating System: ITRON O-SGX Target: SGX O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-wasm Target: WASM (WebAssembly), http://webassembly.org/ O-windows Operating system: Windows 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-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.78.0

Development

Successfully merging this pull request may close these issues.

9 participants

@cuviper @rustbot @bors @rust-log-analyzer @gvozdvmozgu @oli-obk @compiler-errors @lqd @ChrisDenton