Skip to content

Rollup of 5 pull requests#114366

Closed
Noratrieb wants to merge 7 commits into
rust-lang:masterfrom
Noratrieb:rollup-8fi98xy
Closed

Rollup of 5 pull requests#114366
Noratrieb wants to merge 7 commits into
rust-lang:masterfrom
Noratrieb:rollup-8fi98xy

Conversation

@Noratrieb

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJung and others added 7 commits August 1, 2023 18:23
…oli-obk

Use `upvar_tys` in more places, make it return a list

Just a cleanup that fell out of a PR that I was gonna write, but that PR kinda got stuck.
fix and extend ptr_comparison test

r? `@oli-obk`
…ount, r=albertlarsan68

x.py print more detailed format files and untracked files count

Fixes rust-lang#114245
@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 2, 2023
@Noratrieb

Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=5

@bors

bors commented Aug 2, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit f35308c has been approved by Nilstrieb

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 Aug 2, 2023
@fmease

fmease commented Aug 2, 2023

Copy link
Copy Markdown
Member

#114353 failed CI (rustfmt): #114353 (comment)

@lqd

lqd commented Aug 2, 2023

Copy link
Copy Markdown
Member

what do you mean ? #114253 is not r+ed nor in the rollup.

@Noratrieb

Copy link
Copy Markdown
Member Author

you messed up the number, but I see

@Noratrieb

Copy link
Copy Markdown
Member Author

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 2, 2023
@Noratrieb

Copy link
Copy Markdown
Member Author

it's #114353

@Noratrieb Noratrieb closed this Aug 2, 2023
@fmease

fmease commented Aug 2, 2023

Copy link
Copy Markdown
Member

yea, sorry copy/pasted the wrong thing, I meant #114353

@lqd

lqd commented Aug 2, 2023

Copy link
Copy Markdown
Member

Note that bors/whatever also messed up the rollup again, it mentions 5 PRs but has rolled up 3.

@Noratrieb

Copy link
Copy Markdown
Member Author

the follow-up got all 5: #114367 !!!

@Noratrieb

Copy link
Copy Markdown
Member Author

lol, #114353 was among the unlucky ones, so this rollup would have actually passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants