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

Highlight clarifying information in "expected/found" error #136415

Merged
merged 1 commit into from
Feb 2, 2025

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Feb 2, 2025

When the expected and found types have the same textual representation, we add clarifying in parentheses. We now visually highlight it in the output.

Detect a corner case where the clarifying information would be the same for both types and skip it, as it doesn't add anything useful.

Screenshot of the rustc highlighted output on the terminal

@rustbot
Copy link
Collaborator

rustbot commented Feb 2, 2025

r? @chenyukang

rustbot has assigned @chenyukang.
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 Feb 2, 2025
@rust-log-analyzer

This comment has been minimized.

When the expected and found types have the same textual representation, we add clarifying in parentheses. We now visually highlight it in the output.

Detect a corner case where the clarifying information would be the same for both types and skip it, as it doesn't add anything useful.
@estebank estebank force-pushed the highlight-clarification branch from ae45422 to c75e601 Compare February 2, 2025 02:39
@compiler-errors
Copy link
Member

r? compiler-errors @bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 2, 2025

📌 Commit c75e601 has been approved by compiler-errors

It is now in the queue for this repository.

@rustbot rustbot assigned compiler-errors and unassigned chenyukang Feb 2, 2025
@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 Feb 2, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 2, 2025
…r=compiler-errors

Highlight clarifying information in "expected/found" error

When the expected and found types have the same textual representation, we add clarifying in parentheses. We now visually highlight it in the output.

Detect a corner case where the clarifying information would be the same for both types and skip it, as it doesn't add anything useful.

![Screenshot of the rustc highlighted output on the terminal](https://github.com/user-attachments/assets/aa4b9433-5332-4941-b2c2-1a43e5cadff7)
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2025
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#134272 (Remove rustc_encodable_decodable feature)
 - rust-lang#136283 (Update encode_utf16 to mention it is native endian)
 - rust-lang#136394 (Clean up MonoItem::instantiation_mode)
 - rust-lang#136402 (diagnostics: fix borrowck suggestions for if/while let conditionals)
 - rust-lang#136415 (Highlight clarifying information in "expected/found" error)
 - rust-lang#136422 (Convert two `rustc_middle::lint` functions to `Span` methods.)
 - rust-lang#136434 (rustc_allowed_through_unstable_modules: require deprecation message)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7e3d872 into rust-lang:master Feb 2, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 2, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2025
Rollup merge of rust-lang#136415 - estebank:highlight-clarification, r=compiler-errors

Highlight clarifying information in "expected/found" error

When the expected and found types have the same textual representation, we add clarifying in parentheses. We now visually highlight it in the output.

Detect a corner case where the clarifying information would be the same for both types and skip it, as it doesn't add anything useful.

![Screenshot of the rustc highlighted output on the terminal](https://github.com/user-attachments/assets/aa4b9433-5332-4941-b2c2-1a43e5cadff7)
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.

6 participants