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

improve _ constants in item signature handling #92582

Merged
merged 5 commits into from
Jan 20, 2022

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Jan 5, 2022

removing the "type" from the error messages does slightly worsen the error messages for types, but figuring out whether the placeholder is for a type or a constant and correctly dealing with that seemed fairly difficult to me so I took the easy way out ✨ Imo the error message is still clear enough.

r? @BoxyUwU cc @estebank

@lcnr lcnr added A-diagnostics Area: Messages for errors, warnings, and lints A-const-generics Area: const generics (parameters and arguments) labels Jan 5, 2022
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 5, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 5, 2022
@lcnr lcnr force-pushed the generic-arg-infer branch from 6c3fb3e to c0aa0fa Compare January 5, 2022 10:48
@lcnr lcnr changed the title improve _ constants in signature handling improve _ constants in item signature handling Jan 5, 2022
@BoxyUwU
Copy link
Member

BoxyUwU commented Jan 13, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jan 13, 2022

📌 Commit a3c55ac has been approved by BoxyUwU

@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 13, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 14, 2022
improve `_` constants in item signature handling

removing the "type" from the error messages does slightly worsen the error messages for types, but figuring out whether the placeholder is for a type or a constant and correctly dealing with that seemed fairly difficult to me so I took the easy way out ✨ Imo the error message is still clear enough.

r? `@BoxyUwU` cc `@estebank`
@matthiaskrgr
Copy link
Member

@bors r-
failed in a rollup: #92907 (comment)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 15, 2022
@lcnr lcnr force-pushed the generic-arg-infer branch from a3c55ac to 641bba4 Compare January 17, 2022 06:55
@lcnr
Copy link
Contributor Author

lcnr commented Jan 17, 2022

intra-doc links should be correct now:

@bors r=BoxyUwU

@lcnr lcnr closed this Jan 17, 2022
@lcnr lcnr reopened this Jan 17, 2022
@lcnr
Copy link
Contributor Author

lcnr commented Jan 17, 2022

@bors r=BoxyUwU

@lcnr
Copy link
Contributor Author

lcnr commented Jan 17, 2022

seems like bors is broken right now? cc @rust-lang/infra

@bors
Copy link
Contributor

bors commented Jan 17, 2022

☔ The latest upstream changes (presumably #90986) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum
Copy link
Member

If https://bors.rust-lang.org/queue/rust loads, you can typically close/reopen a PR to get bors to pick up new comments. It looks like this PR has a merge conflict though, anyway.

@lcnr lcnr force-pushed the generic-arg-infer branch from 641bba4 to 217458b Compare January 18, 2022 11:31
@lcnr
Copy link
Contributor Author

lcnr commented Jan 18, 2022

@bors r=BoxyUwU

@bors
Copy link
Contributor

bors commented Jan 18, 2022

📌 Commit 217458b has been approved by BoxyUwU

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 18, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2022
…askrgr

Rollup of 13 pull requests

Successful merges:

 - rust-lang#89747 (Add MaybeUninit::(slice_)as_bytes(_mut))
 - rust-lang#89764 (Fix variant index / discriminant confusion in uninhabited enum branching)
 - rust-lang#91606 (Stabilize `-Z print-link-args` as `--print link-args`)
 - rust-lang#91694 (rustdoc: decouple stability and const-stability)
 - rust-lang#92183 (Point at correct argument when async fn output type lifetime disagrees with signature)
 - rust-lang#92582 (improve `_` constants in item signature handling)
 - rust-lang#92680 (intra-doc: Use the impl's assoc item where possible)
 - rust-lang#92704 (Change lint message to be stronger for &T -> &mut T transmute)
 - rust-lang#92861 (Rustdoc mobile: put out-of-band info on its own line)
 - rust-lang#92992 (Help optimize out backtraces when disabled)
 - rust-lang#93038 (Fix star handling in block doc comments)
 - rust-lang#93108 (:arrow_up: rust-analyzer)
 - rust-lang#93112 (Fix CVE-2022-21658)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit db1253f into rust-lang:master Jan 20, 2022
@rustbot rustbot added this to the 1.60.0 milestone Jan 20, 2022
@lcnr lcnr deleted the generic-arg-infer branch January 21, 2022 07:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-const-generics Area: const generics (parameters and arguments) A-diagnostics Area: Messages for errors, warnings, and lints 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.

7 participants