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.

Sign up for GitHub

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

Jump to bottom

Rollup of 6 pull requests #103344

Merged
merged 20 commits into from
Oct 21, 2022
Merged

Rollup of 6 pull requests #103344

merged 20 commits into from
Oct 21, 2022

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cjgillot and others added 20 commits October 16, 2022 08:56
@cjgillot
Account for hygiene when suggesting typos.
6d947e6
@cjgillot
Point to shadowed name when it exists.
4bbb163
@davidtwco
macros: support doc comments in diag derives
7fbaf27 
Documentation comments shouldn't affect the diagnostic derive in any
way, but explicit support has to be added for ignoring the `doc`
attribute.

Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco
macros: allow subdiagnostic-kind-less variants
1045e69 
Sometimes it is convenient to return a subdiagnostic enum where one or
more of the variants don't add anything to the diagnostic.

Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco
macros: fully specify path to Fn
feeeb11 
Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco
ast_lowering: use derive more
2a4b587 
Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco
ast_passes: use derive more
ea5d258 
Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco
lint: use derive more
21d3bbd 
Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco
session: use derive more
f8b628b 
Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco
infer: use derive more
913f597 
Signed-off-by: David Wood <david.wood@huawei.com>
@cuviper
Fixup a few tests needing asm support
f8e157b
@kper
Implement assertions and fixes to not emit empty spans without sugges…
28d0312 
…tions
@compiler-errors
Elaborate supertrait bounds when triggering unused_must_use on impl T…
8509819 
…rait
@notriddle
rustdoc: improve appearance of source page navigation bar
f6dd470 
This commit changes things so that the search bar is exactly centered between
the top of the page and the top of the source code content area.
@Dylan-DPC
Rollup merge of rust-lang#102287 - compiler-errors:unused-must-use-al…
66d91d8 
…so-supertrait, r=fee1-dead

Elaborate supertrait bounds when triggering `unused_must_use` on `impl Trait`

Given `impl Trait`, if one of its supertraits has a `#[must_use]`, then trigger the lint. This means that, for example, `-> impl ExactSizeIterator` also triggers the `must_use` on `trait Iterator`, which fixes rust-lang#102183.

This might need `@rust-lang/lang` sign-off, since it changes the behavior of the lint, so cc'ing them.
@Dylan-DPC
Rollup merge of rust-lang#102922 - kper:bugfix/102902-filtering-json,…
0a0e9f7 
… r=oli-obk

Filtering spans when emitting json

According to the issue rust-lang#102902, we shouldn't emit spans which have an empty span and no suggested replacement.
@Dylan-DPC
Rollup merge of rust-lang#103051 - davidtwco:translation-tidying-up, …
e11511d 
…r=compiler-errors

translation: doc comments with derives, subdiagnostic-less enum variants, more derive use

- Adds support for `doc` attributes in the diagnostic derives so that documentation comments don't result in the derive failing.
- Adds support for enum variants in the subdiagnostic derive to not actually correspond to an addition to a diagnostic.
- Made use of the derive in more places in the `rustc_ast_lowering`, `rustc_ast_passes`, `rustc_lint`, `rustc_session`, `rustc_infer` - taking advantage of recent additions like eager subdiagnostics, multispan suggestions, etc.

cc rust-lang#100717
@Dylan-DPC
Rollup merge of rust-lang#103111 - cjgillot:shadow-label, r=estebank
41a1cfd 
Account for hygiene in typo suggestions, and use them to point to shadowed names

Fixes rust-lang#97459

r? `@estebank`
@Dylan-DPC
Rollup merge of rust-lang#103260 - cuviper:needs-asm-support, r=fee1-…
3055eb9 
…dead

Fixup a few tests needing asm support
@Dylan-DPC
Rollup merge of rust-lang#103321 - notriddle:notriddle/source-page-to…
325e920 
…p-bar-layout, r=GuillaumeGomez

rustdoc: improve appearance of source page navigation bar

This commit changes things so that the search bar is exactly centered between the top of the page and the top of the source code content area.

Preview: https://notriddle.com/notriddle-rustdoc-demos/source-page-header/src/std/lib.rs.html

## Before

![image](https://user-images.githubusercontent.com/1593513/197053420-02a64627-48ed-4bb6-9363-a1863d47b092.png)

## After

![image](https://user-images.githubusercontent.com/1593513/197053355-bd6149f9-0f5c-47da-aeb7-590b5eecb5da.png)
@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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 Oct 21, 2022
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Oct 21, 2022

📌 Commit 325e920 has been approved by Dylan-DPC

It is now in the queue for this repository.

@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 Oct 21, 2022
@bors
Copy link
Contributor

bors commented Oct 21, 2022

⌛ Testing commit 325e920 with merge 657f246...

@bors
Copy link
Contributor

bors commented Oct 21, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 21, 2022
@bors bors merged commit 657f246 into rust-lang:master Oct 21, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 21, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#103321 c2578ba30a212fbbd3429773ae0bd80a2d270226
#103260 cfa724e5fc85722a77d31906108e9dbb0a0b0aa2
#103111 52f3566a1d2c6967d4d8f33ead0b30a71b69a531
#103051 72152ae65f26004a2a58e8496ea583a9d60533ba
#102922 20f0404f2a69a688f4cd236d7fefa46a7a57314f
#102287 a16a993b7f8f44f692c1d52f4ab1f57f63319183

previous master: 0940040c04

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

This was referenced Oct 21, 2022
Merged
Closed
Merged
Merged
Merged
Merged
Merged
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (657f246): 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.

mean1 range count2
Regressions ❌
(primary)		 3.1% [3.1%, 3.1%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 3.1% [3.1%, 3.1%] 1

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.

mean1 range count2
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.5% [-1.5%, -1.5%] 1
Improvements ✅
(secondary)		 -2.1% [-2.2%, -2.0%] 2
All ❌✅ (primary) -1.5% [-1.5%, -1.5%] 1

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2

  2. number of relevant changes ↩ ↩2

flip1995 pushed a commit to flip1995/rust that referenced this pull request Nov 21, 2022
@bors
Auto merge of rust-lang#103344 - Dylan-DPC:rollup-d1rpfvx, r=Dylan-DPC
46cf1ea 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#102287 (Elaborate supertrait bounds when triggering `unused_must_use` on `impl Trait`)
 - rust-lang#102922 (Filtering spans when emitting json)
 - rust-lang#103051 (translation: doc comments with derives, subdiagnostic-less enum variants, more derive use)
 - rust-lang#103111 (Account for hygiene in typo suggestions, and use them to point to shadowed names)
 - rust-lang#103260 (Fixup a few tests needing asm support)
 - rust-lang#103321 (rustdoc: improve appearance of source page navigation bar)

Failed merges:

 - rust-lang#103209 (Diagnostic derives: allow specifying multiple alternative suggestions)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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
Milestone
1.66.0
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@Dylan-DPC @bors @rust-timer @rustbot @cjgillot @davidtwco @cuviper @kper @compiler-errors @notriddle