Skip to content

Do not assume const params are printed after type params #135749

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

Merged
merged 1 commit into from
Jan 25, 2025

Conversation

compiler-errors
Copy link
Member

Fixes #135737

@rustbot
Copy link
Collaborator

rustbot commented Jan 19, 2025

r? @davidtwco

rustbot has assigned @davidtwco.
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 Jan 19, 2025
@compiler-errors
Copy link
Member Author

This code seriously un-jank-ifies the printing logic for type mismatches.

Comment on lines 728 to 730
if !args.is_empty() {
value.push_highlighted("<");
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if !args.is_empty() {
value.push_highlighted("<");
}
if args.is_empty() {
return;
}
value.push_highlighted("<");

Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

LGTM, r=me, resolving @fbstj's comment if you want

@compiler-errors
Copy link
Member Author

@bors r=davidtwco rollup

@bors
Copy link
Collaborator

bors commented Jan 24, 2025

📌 Commit 97e07da has been approved by davidtwco

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 Jan 24, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 24, 2025
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#135415 (Add `File already exists` error doc to `hard_link` function)
 - rust-lang#135581 (Separate Builder methods from tcx)
 - rust-lang#135728 (document order of items in iterator from drain)
 - rust-lang#135749 (Do not assume const params are printed after type params)
 - rust-lang#135829 (Rustc dev guide subtree update)
 - rust-lang#135938 (Add memory layout documentation to generic NonZero<T>)
 - rust-lang#135949 (Use short type string in E0308 secondary span label)
 - rust-lang#135976 (Don't drop types with no drop glue when building drops for tailcalls)
 - rust-lang#135998 ([rustdoc] Fix indent of trait items on mobile)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ca5fa66 into rust-lang:master Jan 25, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 25, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 25, 2025
Rollup merge of rust-lang#135749 - compiler-errors:param-ordering, r=davidtwco

Do not assume const params are printed after type params

Fixes rust-lang#135737
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.

order of type and const generics is different in diagnostics
5 participants