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

triagebot no-merges: exclude different case #117562

Merged
merged 1 commit into from
Nov 4, 2023
Merged

triagebot no-merges: exclude different case #117562

merged 1 commit into from
Nov 4, 2023

Conversation

pitaj
Copy link
Contributor

@pitaj pitaj commented Nov 4, 2023

"Subtree update" as well

To address this on zulip

cc @bjorn3

r? @Mark-Simulacrum

@pitaj pitaj added the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label Nov 4, 2023
@rustbot rustbot added A-meta Area: Issues about the rust-lang/rust repository. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 4, 2023
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 4, 2023

📌 Commit a745f92 has been approved by Mark-Simulacrum

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 Nov 4, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 4, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 4, 2023
@bors
Auto merge of rust-lang#117590 - matthiaskrgr:rollup-9cqh1q8, r=matth…
4b85902 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#110340 (Deref docs: expand and remove "smart pointer" qualifier)
 - rust-lang#116894 (Guarantee that `char` has the same size and alignment as `u32`)
 - rust-lang#117534 (clarify that the str invariant is a safety, not validity, invariant)
 - rust-lang#117562 (triagebot no-merges: exclude different case)
 - rust-lang#117570 (fallback for `construct_generic_bound_failure`)
 - rust-lang#117583 (Remove `'tcx` lifetime on `PlaceholderConst`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b9dcbd4 into rust-lang:master Nov 4, 2023
11 checks passed
@rustbot rustbot added this to the 1.75.0 milestone Nov 4, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 4, 2023
@rust-timer
Unrolled build for rust-lang#117562
9618932 
Rollup merge of rust-lang#117562 - pitaj:triagebot_no-merges, r=Mark-Simulacrum

triagebot no-merges: exclude different case

"Subtree update" as well

To address [this on zulip](https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/can't.20suppress.20merge.20commit.20warning)

cc `@bjorn3`

r? `@mark-simulacrum`
@github-actions github-actions bot mentioned this pull request Nov 6, 2023
Merged
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Nov 6, 2023
@bors-ferrocene @BenWiederhake
@SabrinaJewson @J-ZhengLi @koka831 @bjorn3 @joshlf @lengyijun @Zalathar @oli-obk @flip1995 @y21 @bors @bvanjoi
Merge #84
a01e81f 
84: Automated pull from upstream `master` r=Dajamante a=github-actions[bot]


This PR pulls the following changes from the upstream repository:

* rust-lang/rust#117585
* rust-lang/rust#117576
* rust-lang/rust#96979
* rust-lang/rust#117191
* rust-lang/rust#117179
* rust-lang/rust#117574
* rust-lang/rust#117537
* rust-lang/rust#117608
  * rust-lang/rust#117596
  * rust-lang/rust#117588
  * rust-lang/rust#117524
  * rust-lang/rust#116017
* rust-lang/rust#117504
* rust-lang/rust#117469
* rust-lang/rust#116218
* rust-lang/rust#117589
* rust-lang/rust#117581
* rust-lang/rust#117503
* rust-lang/rust#117590
  * rust-lang/rust#117583
  * rust-lang/rust#117570
  * rust-lang/rust#117562
  * rust-lang/rust#117534
  * rust-lang/rust#116894
  * rust-lang/rust#110340
* rust-lang/rust#113343
* rust-lang/rust#117579
* rust-lang/rust#117094
* rust-lang/rust#117566
* rust-lang/rust#117564
  * rust-lang/rust#117554
  * rust-lang/rust#117550
  * rust-lang/rust#117343
* rust-lang/rust#115274
* rust-lang/rust#117540
* rust-lang/rust#116412
* rust-lang/rust#115333
* rust-lang/rust#117507
* rust-lang/rust#117538
  * rust-lang/rust#117533
  * rust-lang/rust#117523
  * rust-lang/rust#117520
  * rust-lang/rust#117505
  * rust-lang/rust#117434
* rust-lang/rust#117535
* rust-lang/rust#117510
* rust-lang/rust#116439
* rust-lang/rust#117508



Co-authored-by: Ben Wiederhake <[email protected]>
Co-authored-by: SabrinaJewson <[email protected]>
Co-authored-by: J-ZhengLi <[email protected]>
Co-authored-by: koka <[email protected]>
Co-authored-by: bjorn3 <[email protected]>
Co-authored-by: Joshua Liebow-Feeser <[email protected]>
Co-authored-by: lengyijun <[email protected]>
Co-authored-by: Zalathar <[email protected]>
Co-authored-by: Oli Scherer <[email protected]>
Co-authored-by: Philipp Krones <[email protected]>
Co-authored-by: y21 <[email protected]>
Co-authored-by: bors <[email protected]>
Co-authored-by: bohan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-meta Area: Issues about the rust-lang/rust repository. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.75.0
Development

Successfully merging this pull request may close these issues.
4 participants
@pitaj @Mark-Simulacrum @bors @rustbot