Skip to content

Rollup of 6 pull requests - #101652

Merged
bors merged 17 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-f4atky0
Sep 10, 2022
Merged

Rollup of 6 pull requests#101652
bors merged 17 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-f4atky0

Conversation

@Dylan-DPC

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

jyn514and others added 17 commits September 6, 2022 21:41
remove bound var hack in `resolve`
somehow dropped that change from rust-lang#98900.
r? `@jackh726`
Equate fn outputs when inferring RPITIT hidden types
When we are trying to infer the hidden types for RPITITs, we need to equate the output tys instead of just subtyping them. For example:
```rust
trait Foo { fn bar() -> impl Sized {} }
impl Foo for () { fn bar() -> &'static str { "" } }
```
If we just subtype the signatures `fn() -> &'static str <: fn() -> _#1t` (where `_#1t` is the variable we've used to infer `impl Sized`), we'll end up `&'static str <: _#1t`, which causes us to infer `_#1t = #'_#2r str`, where `'_#2r` is unconstrained, which gets fixed up to `ReEmpty`, and which is certainly not what we want.
I can't actually think of a way to make this fail to compile, because during borrowck we've already done the method probe, and so we just look at the `impl` method signature and see the `&'static str` any time we call `<() as Foo>::bar()`. But this _does_ cause the ICE [here](rust-lang#98559 (comment)) in `@jackh726's` "Remove ReEmpty" PR (rust-lang#98559) to stop ICEing, because after that PR we were leaking unconstrained region variables into the typeck results.
r? types
…le, r=GuillaumeGomez
rustdoc: avoid cleaning modules with duplicate names
Fixesrust-lang#83375
…llot
Move `Queries::new` out of the macro
Split out from rust-lang#101178 to make sure it's not contributing to the perf impact.
r? `@cjgillot`
…est, r=Dylan-DPC
Update browser-ui-test version to 0.9.8
This version improves the error output mostly.
r? `@Dylan-DPC`
@rustbotrustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 10, 2022
@Dylan-DPC

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Sep 10, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 7835610 has been approved by Dylan-DPC

It is now in the queue for this repository.

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 10, 2022
@bors

bors commented Sep 10, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7835610 with merge 1463688...

@bors

bors commented Sep 10, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 1463688 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 10, 2022
@bors
bors merged commit 1463688 into rust-lang:masterSep 10, 2022
@rustbotrustbot added this to the 1.65.0 milestone Sep 10, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#Perf Build Sha
#101641036c12de8505c68e368742738197c1b7b06516a6
#10163543fff12f38789b7a2a8456e8bb06c529364bf81b
#1016311177e48cfb82361bd02c0b2c20d1805b09942835
#101614a659f5af59defb6f2f542b972eaefb38dd6b0a07
#101606cb03e461ed04161e2142178074aa8e73b4f1a438
#1015788cbce54b418a3474db599ada324542fed1d3818c

previous master: 2e44c17c12

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
Copy Markdown
Collaborator

Finished benchmarking commit (1463688): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean1rangecount2
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-0.4%[-1.3%, -0.2%]7
Improvements ✅
(secondary)
-2.6%[-3.8%, -0.4%]8
All ❌✅ (primary)-0.4%[-1.3%, -0.2%]7

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.

mean1rangecount2
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
2.5%[2.5%, 2.5%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-0.6%[-0.6%, -0.6%]1
All ❌✅ (primary)--0

Cycles

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.

mean1rangecount2
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
0.5%[0.5%, 0.5%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)--0

Footnotes

  1. the arithmetic mean of the percent change23

  2. number of relevant changes23

@lcnr

lcnr commented Sep 12, 2022

Copy link
Copy Markdown
Contributor

i would expect the perf impact to be from #101578, forgot to mark that pr as rollup=never

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

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant 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.

10 participants

@Dylan-DPC@bors@rust-timer@lcnr@rustbot@jyn514@akhi3030@compiler-errors@notriddle@GuillaumeGomez