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.

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

Rollup of 4 pull requests #112964

Closed
wants to merge 11 commits into from

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

flip1995 and others added 11 commits June 16, 2023 17:57
This reverts commit fd3d2d4.

This has the side effect, that when Clippy should ICE (during an EarlyPass?) it
will fill up the RAM with 2 GB/s and then freezes the PC. I don't know the
correct solution, but this is blocking the Clippy sync and might give some
people really bad experiences, so this should be reverted ASAP.
…ce, r=cjgillot

Revert "Don't hold the active queries lock while calling `make_query`"

This reverts commit fd3d2d4.

This has the side effect, that when Clippy should ICE (during an EarlyPass?) it will fill up the RAM with 2 GB/s and then freezes the PC. I don't know the correct solution, but this is blocking the Clippy sync and might give some people really bad experiences, so this should be reverted ASAP.

Reverts rust-lang#112333

r? `@cjgillot`
cc `@Zoxc`

I only commented this on [Zulip](https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/.60try_print_query_stack.60.20has.20.60ImplicitCtx.60.20during.20.60EarlyPass.60/near/363926180). I should've left a comment on the PR as well. My bad.
…ter, r=notriddle

Add link to rustdoc book search chapter in help popover

One thing that was missing in the rustdoc output and its help popover was a link back to the search feature chapter in the rustdoc book.

It looks like this:

![image](https://github.com/rust-lang/rust/assets/3050060/425413e5-e734-4d40-b675-8b2dcef874a2)

r? `@notriddle`
Stop hiding const eval limit in external macros

fixes rust-lang#112748

We don't emit a hard error if there was a previous deny lint triggering with the same message. If that lint ends up not being emitted, we ICE and don't emit an error either.
…, r=notriddle

[tests/rustdoc] Add @files command

The ``@!has`` checks is very problematic as it wouldn't catch if the file scheme is updated and the file is generated again. ``@files`` allows to ensure that the given folder contains exactly the provided entries (files and folders).

I'm wondering if we should forbid the ``@!has`` for files. To be discussed after this PR I suppose.

r? `@notriddle`
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 23, 2023
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=4 rollup=never

@bors
Copy link
Contributor

bors commented Jun 23, 2023

📌 Commit 1ab9dd1 has been approved by GuillaumeGomez

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 Jun 23, 2023
@bors
Copy link
Contributor

bors commented Jun 23, 2023

⌛ Testing commit 1ab9dd1 with merge 6873b1ff3b21425e3f0b4f13a064e26f8fbcf996...

@flip1995
Copy link
Member

@GuillaumeGomez #112708 breaks those rollups, see #112708 (comment)

You might want to cancel this rollup and start one without the PR. Sorry for not taking it out of the queue earlier.

@matthiaskrgr
Copy link
Member

@bors r-
#112708 (comment)

@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 Jun 23, 2023
@GuillaumeGomez
Copy link
Member Author

Thanks for letting me know!

@GuillaumeGomez GuillaumeGomez deleted the rollup-to87361 branch June 23, 2023 16:12
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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-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.

7 participants