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 #118200

Merged
merged 9 commits into from
Nov 23, 2023
Merged

Rollup of 4 pull requests #118200

merged 9 commits into from
Nov 23, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Lukas Markeffsky and others added 9 commits November 21, 2023 12:20
…wiser

improve tool-only help for multiple `#[default]` variants

When defining an enum with multiple `#[default]` variants, we emit a tool-only suggestion for every `#[default]`ed variant to remove all other `#[default]`s. This PR improves the suggestion to correctly handle the cases where one variant has multiple `#[default]`s and where different `#[default]`s have the same span due to macro expansions.

fixes rust-lang#118119
…ions, r=lcnr

Rework supertrait lint once again

I accidentally pushed the wrong commits because I totally didn't check I was on the right computer when updating rust-lang#118026.
Sorry, this should address all the nits in rust-lang#118026.

r? lcnr
…l, r=petrochenkov

make the 'abi_unadjusted' feature internal

As [suggested](rust-lang#118127 (comment)) by `@bjorn3.`
…ler-errors

print query map for deadlock when using parallel front end

print query map for deadlock when using parallel front end, so that we can analyze where and why deadlock occurs
@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. rollup A PR which is a rollup labels Nov 23, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Nov 23, 2023

📌 Commit 0223a81 has been approved by matthiaskrgr

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

bors commented Nov 23, 2023

⌛ Testing commit 0223a81 with merge fc13ca6...

@bors
Copy link
Contributor

bors commented Nov 23, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing fc13ca6 to master...

1 similar comment
@bors
Copy link
Contributor

bors commented Nov 23, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing fc13ca6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 23, 2023
@bors bors merged commit fc13ca6 into rust-lang:master Nov 23, 2023
11 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 23, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#118131 improve tool-only help for multiple #[default] variants 4f998ac5c2be74fff973a8710ffbabfbc4f1f978 (link)
#118146 Rework supertrait lint once again b22a3df8d2ab88fe526776d091df8822871d2e6d (link)
#118167 make the 'abi_unadjusted' feature internal 46522a17968e7cc7f2a62bde91412de32f5e55d3 (link)
#118169 print query map for deadlock when using parallel front end 11de03738dfaee1e5a7fa4c93f074696af47a6c3 (link)

previous master: 193466525d

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 (fc13ca6): 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)
1.7% [1.7%, 1.7%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.6% [-0.8%, -0.5%] 3
All ❌✅ (primary) 1.7% [1.7%, 1.7%] 1

Cycles

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

Binary size

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

Bootstrap: 675.802s -> 676.494s (0.10%)
Artifact size: 313.70 MiB -> 313.75 MiB (0.02%)

@matthiaskrgr matthiaskrgr deleted the rollup-neka6xo branch March 16, 2024 18:19
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) 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants