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 2 pull requests #113057

Merged
merged 4 commits into from
Jun 27, 2023
Merged

Rollup of 2 pull requests #113057

merged 4 commits into from
Jun 27, 2023

Conversation

TaKO8Ki
Copy link
Member

@TaKO8Ki TaKO8Ki commented Jun 26, 2023

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

the8472 and others added 4 commits June 15, 2023 21:14
since DrainFilter no longer continues draining when it's dropped
the panic tracking is no longer needed.
…hnTitor

remove unused field

Followup to rust-lang#104455. The field is no longer needed since ExtractIf (previously DrainFilter) doesn't keep draining in its drop impl.
…aumeGomez

rustdoc: render generic params & where-clauses of cross-crate assoc tys in impls

We used to only ever render generic parameters & where-clauses of cross-crate associated types when the item was located inside of a trait and we used to just drop them when it was inside of an impl block (trait or inherent).

Fixes rust-lang#112904.

`@rustbot` label A-cross-crate-reexports
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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 Jun 26, 2023
@TaKO8Ki
Copy link
Member Author

TaKO8Ki commented Jun 26, 2023

@bors r+ rollup=never p=2

@bors
Copy link
Contributor

bors commented Jun 26, 2023

📌 Commit 40e3fcf has been approved by TaKO8Ki

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

bors commented Jun 26, 2023

⌛ Testing commit 40e3fcf with merge 36fb58e...

@bors
Copy link
Contributor

bors commented Jun 26, 2023

☀️ Test successful - checks-actions
Approved by: TaKO8Ki
Pushing 36fb58e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 26, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#112677 remove unused field 0bf205b42a61850f088a2e89b1efe54b7108dc8b (link)
#112920 rustdoc: render generic params & where-clauses of cross-cra… d03f5aaaface63833c9556dab6dc3fe4968231ff (link)

previous master: 6f8c27ae89

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 (36fb58e): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

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

mean range count
Regressions ❌
(primary)
0.5% [0.4%, 0.8%] 5
Regressions ❌
(secondary)
0.8% [0.3%, 1.1%] 12
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.5% [0.4%, 0.8%] 5

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)
1.4% [1.2%, 1.6%] 3
Regressions ❌
(secondary)
1.4% [1.4%, 1.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.3% [-2.3%, -2.3%] 1
All ❌✅ (primary) 1.4% [1.2%, 1.6%] 3

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.

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

Binary size

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

Bootstrap: 663.81s -> 662.919s (-0.13%)

@rustbot rustbot added the perf-regression Performance regression. label Jun 26, 2023
@fmease
Copy link
Member

fmease commented Jun 26, 2023

Huh, weird, master now includes the commits found in this rollup but none of three PRs are marked as merged (rollup PR + the containing 2 PRs) and they are now marked as conflicting. Asking T-infra on Zulip...

@bors bors merged commit 36fb58e into rust-lang:master Jun 27, 2023
12 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Jun 27, 2023
@fmease
Copy link
Member

fmease commented Jun 27, 2023

Re perf regression: I've fixed a correctness bug in rustdoc with the most straightforward solution. We are now doing more work per associated type to gather the necessary data. It's unclear to me if there's a simple way to boost the perf.

Not sure if that suffices as an explanation. Hence not adding the triaged label.

@TaKO8Ki TaKO8Ki deleted the rollup-071lc9g branch June 27, 2023 01:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. 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-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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants