Print note with closure signature on type mismatch #123379
Conversation
rustbot
added
S-waiting-on-review
compiler/rustc_middle/src/ty/sty.rs
Outdated
| @@ -266,6 +266,11 @@ impl<'tcx> ClosureArgs<'tcx> { | |||
| pub fn print_as_impl_trait(self) -> ty::print::PrintClosureAsImpl<'tcx> { | |||
| ty::print::PrintClosureAsImpl { closure: self } | |||
| } | |||
|
|
|||
| /// Prints closure signature in form of `fn(Args) -> Output` with stripped `extern "rust-call`. | |||
| pub fn print_signature(self) -> ty::print::PrintClosureSignature<'tcx> { | |||
There was a problem hiding this comment.
Can we not just reuse print_as_impl_trait? Seems like it does basically the same thing, except for being prefixed with impl Fn instead of fn. I don't expect users to particularly care, since the point is the signature.
There was a problem hiding this comment.
Yes, I believe we can reuse that if we do not have anything against prefixed impl Fn, it conveys the same information. However, it may be confusing for the reader of the note because in the first note, we say expected fn pointer fn(args), and possibly in the second one ..has signature: impl Fn(args), won't the reader be confused by fn vs Fn? My reasoning for using the current output of ..has signature: fn(args) is just for consistency with the first note, but if you think it is negligible, I will change it for the impl variant.
There was a problem hiding this comment.
I don't think this matters
There was a problem hiding this comment.
I've found out that it is also possible to extract the fn-like signature, without the impl from the closure more easily with the signature_unclosure, so this may be even better?
|
r? compiler-errors |
| @@ -721,6 +721,16 @@ impl<'a, G: EmissionGuarantee> Diag<'a, G> { | |||
| self | |||
| } | |||
|
|
|||
| #[rustc_lint_diagnostics] | |||
There was a problem hiding this comment.
Can you inline this into the one caller that it's used? Also, this could be a Subdiagnostic, perhaps? I'm not sure if highlighted_note handles translatable string parts...
There was a problem hiding this comment.
Yes, I agree this should probably be Subdiagnostic, however the highlighted_note is accepting only StringPart and not the impl Into<SubdiagMessage> (which is the translatable string part right?). Should address the highlighted_note so it is accepting the SubdiagMessage in this PR?
Also, we can do it without colorshighlighting for now.
|
@bors r+ |
bors
added
S-waiting-on-bors
Print note with closure signature on type mismatch Fixes rust-lang#119266 r? Nilstrieb
Rollup of 11 pull requests Successful merges: - rust-lang#123379 (Print note with closure signature on type mismatch) - rust-lang#123967 (static_mut_refs: use raw pointers to remove the remaining FIXME) - rust-lang#123976 (Use fake libc in core test) - rust-lang#123986 (lint-docs: Add redirects for renamed lints.) - rust-lang#124053 (coverage: Branch coverage tests for lazy boolean operators) - rust-lang#124071 (Add llvm-bitcode-linker to build manifest) - rust-lang#124103 (Improve std::fs::Metadata Debug representation) - rust-lang#124132 (llvm RustWrapper: explain OpBundlesIndirect argument type) - rust-lang#124191 (Give a name to each distinct manipulation of pretty-printer FixupContext) - rust-lang#124193 (Miri subtree update) - rust-lang#124196 (mir-opt tests: rename unit-test -> test-mir-pass) r? `@ghost` `@rustbot` modify labels: rollup
Rollup of 10 pull requests Successful merges: - rust-lang#123379 (Print note with closure signature on type mismatch) - rust-lang#123967 (static_mut_refs: use raw pointers to remove the remaining FIXME) - rust-lang#123976 (Use fake libc in core test) - rust-lang#123986 (lint-docs: Add redirects for renamed lints.) - rust-lang#124053 (coverage: Branch coverage tests for lazy boolean operators) - rust-lang#124071 (Add llvm-bitcode-linker to build manifest) - rust-lang#124103 (Improve std::fs::Metadata Debug representation) - rust-lang#124132 (llvm RustWrapper: explain OpBundlesIndirect argument type) - rust-lang#124191 (Give a name to each distinct manipulation of pretty-printer FixupContext) - rust-lang#124196 (mir-opt tests: rename unit-test -> test-mir-pass) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#123379 - wutchzone:119266, r=compiler-errors Print note with closure signature on type mismatch Fixes rust-lang#119266 r? Nilstrieb
Fixes #119266
r? Nilstrieb