Skip to content

Rollup of 7 pull requests #104945

New issue

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

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

Already on GitHub? # to your account

Merged
merged 22 commits into from
Nov 26, 2022
Merged

Rollup of 7 pull requests #104945

merged 22 commits into from
Nov 26, 2022

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

WaffleLapkin and others added 22 commits November 23, 2022 19:36
This accomplishes the same thing with significantly less code.
…ler-errors

Use the power of adding helper function to simplify code w/ `Mutability`

r? `@compiler-errors`
…en, r=fee1-dead

Do not record unresolved const vars in generator interior

Don't record types in the generator interior when we see unresolved const variables.

We already do this for associated types -- this is important to avoid unresolved inference variables in the generator results during writeback, since the writeback results get stable hashed in incremental mode.

Fixes rust-lang#104787
…ypes-is-misleading, r=fee1-dead

Rename `normalize_opaque_types` to `reveal_opaque_types_in_bounds`

1. The query name is a bit misleading, since it doesn't do any associated type normalization, and
2. since it only takes a predicate list, it sounds a bit more powerful than it actually is.
…y, r=cjgillot

Remove unnecessary binder from `get_impl_future_output_ty`

We never construct an `async fn` with a higher-ranked `impl Future` bound anyways, and basically all the call-sites already skip the binder.
…s, r=GuillaumeGomez

jsondoclint: Accept trait alias is places where trait expected.

More work to make `jsondoclint` work for `core.json`

Closes rust-lang#104923

r? `@GuillaumeGomez`

`@rustbot` modify labels: +A-testsuite
…-flexbox, r=GuillaumeGomez

rustdoc: use flexbox CSS to align sidebar button instead of position

This accomplishes the same thing with significantly less code.

Preview: https://notriddle.com/notriddle-rustdoc-demos/sidebar-toggle-flexbox/src/test_dingus/lib.rs.html
…, r=GuillaumeGomez

jsondoclint: Handle using enum variants and glob using enums.

More work on jsondoclint for `core.json`

Closes rust-lang#104942

r? `@GuillaumeGomez`

`@rustbot` modify labels: +A-testsuite
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend 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 Nov 26, 2022
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=7 rollup=never

@bors
Copy link
Collaborator

bors commented Nov 26, 2022

📌 Commit 95e6356 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 26, 2022
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 26, 2022
@bors
Copy link
Collaborator

bors commented Nov 26, 2022

⌛ Testing commit 95e6356 with merge 80a9646...

@bors
Copy link
Collaborator

bors commented Nov 26, 2022

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 80a9646 to master...

1 similar comment
@bors
Copy link
Collaborator

bors commented Nov 26, 2022

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 80a9646 to master...

@bors bors added merged-by-bors This PR was explicitly merged by bors. labels Nov 26, 2022
@bors bors merged commit 80a9646 into rust-lang:master Nov 26, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha

previous master: 80a96467ec

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rustbot rustbot added this to the 1.67.0 milestone Nov 26, 2022
@GuillaumeGomez GuillaumeGomez deleted the rollup-ygzbpbe branch November 26, 2022 21:11
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#104943 488788fd379d4d10aaa4ea8dbc78c55623510187
#104928 cc8de03dca75a32221e5b8de3efbd40076617513
#104924 d4602e99d6ea3957d066b8a2a08de705c25d5ca2
#104921 bf6c59804519f9dc146c7832adcf74abfb87a211
#104909 3aa8b362c0c1a3ba03bbac2f37a68b7bdc5141c9
#104788 ebccd88e0441620a7d7662de535c287262443a0e
#104786 e3b456ca6042369c49fac3b9a4c8aed526039448

previous master: c3a1c023c0

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (80a9646): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.7% [-2.7%, -2.7%] 1
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-rustdoc-json Area: Rustdoc JSON backend merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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-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