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

Show fnsig's unit output explicitly when there is output diff in diagnostics #127417

Merged
merged 2 commits into from
Jul 6, 2024

Conversation

chenyukang
Copy link
Member

Fixes #127263

@rustbot
Copy link
Collaborator

rustbot commented Jul 6, 2024

r? @oli-obk

rustbot has assigned @oli-obk.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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. labels Jul 6, 2024
@chenyukang chenyukang force-pushed the yukang-method-output-diff branch from 7145cb1 to edd1006 Compare July 6, 2024 08:45
@chenyukang chenyukang changed the title Show function's unit output explicitly when there is only output diff in diagnostics Show fnsig's unit output explicitly when there is only output diff in diagnostics Jul 6, 2024
@@ -39,7 +39,7 @@ note: type in trait
LL | fn bar(self) -> Option<()>;
| ^^^^^^^^^^
= note: expected signature `fn(MyFuture) -> Option<()>`
found signature `fn(MyFuture)`
found signature `fn(MyFuture) -> ()`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure how I feel about those... but seems ok

@oli-obk
Copy link
Contributor

oli-obk commented Jul 6, 2024

Needs a rebase

@chenyukang chenyukang force-pushed the yukang-method-output-diff branch from f3086b7 to 81c86dd Compare July 6, 2024 15:30
@chenyukang chenyukang changed the title Show fnsig's unit output explicitly when there is only output diff in diagnostics Show fnsig's unit output explicitly when there is output diff in diagnostics Jul 6, 2024
@oli-obk
Copy link
Contributor

oli-obk commented Jul 6, 2024

bors r plus

@bors rollup

@bors
Copy link
Contributor

bors commented Jul 6, 2024

📌 Commit 81c86dd has been approved by oli-obk

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 Jul 6, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 6, 2024
…mpiler-errors

Rollup of 4 pull requests

Successful merges:

 - rust-lang#127386 (Uplift outlives components to `rustc_type_ir`)
 - rust-lang#127405 (uplift `PredicateEmittingRelation`)
 - rust-lang#127410 (Correct description of E0502)
 - rust-lang#127417 (Show fnsig's unit output  explicitly when there is output diff in diagnostics)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 413345c into rust-lang:master Jul 6, 2024
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 6, 2024
Rollup merge of rust-lang#127417 - chenyukang:yukang-method-output-diff, r=oli-obk

Show fnsig's unit output  explicitly when there is output diff in diagnostics

Fixes rust-lang#127263
@rustbot rustbot added this to the 1.81.0 milestone Jul 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

Assigning the wrong fn type to a variable mentions 'pointer' vs 'item'
4 participants