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 7 pull requests #113146

Merged
merged 17 commits into from
Jun 29, 2023
Merged

Rollup of 7 pull requests #113146

merged 17 commits into from
Jun 29, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

petrochenkov and others added 17 commits June 15, 2023 21:25
Use a boolean constant parameter instead.

Also turn some methods on `DefIdVisitor` into associated constants.
…ility

This commit reverts a change made in rust-lang#111425.
It was believed that this change was necessary for implementing type privacy lints, but rust-lang#111801 showed that it was not necessary.
Quite opposite, the revert fixes some issues.
Give some additional examples with multi-line patterns.

Make it clearer to go on to the next case if the conditions aren't met.
We already say to format attributes like functions, but we didn't have
an example of formatting a multi-line attribute.
The style guide advises "prefer dereferencing to taking references", but
doesn't give guidance on when that "preference" should get overridden by
other considerations. Give an example of when it's fine to ignore
that advice.
privacy: Type privacy lints fixes and cleanups

See individual commits.
Follow up to rust-lang#111801.
…doesnt_wanna_be_impld, r=compiler-errors

Test that we require implementing trait items whose bounds don't hold in the current impl

I initially tried to make most of these pass, but that's a big can of worms, so I'm just adding them as tests, considering we have no tests for these things.
…nted`-std-agnostic, r=WaffleLapkin

Make `rustc_on_unimplemented` std-agnostic

See rust-lang#112923

r? `@WaffleLapkin`
…=compiler-errors

don't suggest `move` for borrows that aren't closures

fixes rust-lang#113087
…e, r=calebcartwright

style-guide: Clarify let-else further

Give some additional examples with multi-line patterns.

Make it clearer to go on to the next case if the conditions aren't met.
…ulti-line-attribute, r=calebcartwright

style-guide: Add an example of formatting a multi-line attribute

We already say to format attributes like functions, but we didn't have
an example of formatting a multi-line attribute.
…reference-guidance, r=calebcartwright

style-guide: Narrow guidance about references and dereferencing

The style guide advises "prefer dereferencing to taking references", but
doesn't give guidance on when that "preference" should get overridden by
other considerations. Give an example of when it's fine to ignore
that advice.
@rustbot rustbot added 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-libs Relevant to the library team, which will review and decide on the PR/issue. T-style Relevant to the style team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 29, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7j

@bors
Copy link
Contributor

bors commented Jun 29, 2023

📌 Commit 7a7ffce 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 Jun 29, 2023
@bors
Copy link
Contributor

bors commented Jun 29, 2023

⌛ Testing commit 7a7ffce with merge 0a32ca9...

@bors
Copy link
Contributor

bors commented Jun 29, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 29, 2023
@bors bors merged commit 0a32ca9 into rust-lang:master Jun 29, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 29, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#112670 privacy: Type privacy lints fixes and cleanups 98730fb8dd1477bc06d8bf41f8ece8c484dcce55 (link)
#112929 Test that we require implementing trait items whose bounds … 1eab960dfddd89af5489b57dfb8c67b87996e09e (link)
#113054 Make rustc_on_unimplemented std-agnostic 07bafdd6c6c5a5fd2c3a96b36f9f053ae0a123c4 (link)
#113137 don't suggest move for borrows that aren't closures 44c7780e3ac6e2df6b9f63e3649c45b148c4076c (link)
#113139 style-guide: Clarify let-else further 75e82055384e932381d9b63fa085d055cf15de71 (link)
#113140 style-guide: Add an example of formatting a multi-line attr… 0d6c9c7648845eec76d2581b909645605a1f46cb (link)
#113143 style-guide: Narrow guidance about references and dereferen… f9ff43d360c251739b7e96753a187b78119348bd (link)

previous master: 75726cae37

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 (0a32ca9): comparison URL.

Overall result: ❌ regressions - 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.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
1.2% [1.2%, 1.3%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

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.6% [0.5%, 4.2%] 5
Regressions ❌
(secondary)
3.1% [1.2%, 5.0%] 2
Improvements ✅
(primary)
-2.4% [-6.1%, -0.4%] 7
Improvements ✅
(secondary)
-2.8% [-3.2%, -2.4%] 2
All ❌✅ (primary) -0.8% [-6.1%, 4.2%] 12

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)
- - 0
Improvements ✅
(primary)
-0.5% [-0.5%, -0.5%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.5% [-0.5%, -0.5%] 1

Binary size

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

Bootstrap: 659.556s -> 661.126s (0.24%)

@matthiaskrgr matthiaskrgr deleted the rollup-bxtr51e branch March 16, 2024 18:18
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. 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-libs Relevant to the library team, which will review and decide on the PR/issue. T-style Relevant to the style 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