Fix adt_const_params leaking {type error} in error msg
#131038
Conversation
|
r? @wesleywiser rustbot has assigned @wesleywiser. Use |
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
rustbot
added
the
WG-trait-system-refactor
onkoe
force-pushed
the
fix/adt_const_params_leak_118179
branch
from
4756b2f
to
081a8a8
Compare
| if ty.references_error() { | ||
| return Ok(()); | ||
| } |
There was a problem hiding this comment.
Actually, this should just return Err(ErrorGuaranteed) here, rather than Ok(()), I think.
You can use the alternative error_reported function which is like references_error, but returns a Result<(), ErrorGuaranteed> for ease of ? operator:
| if ty.references_error() { | |
| return Ok(()); | |
| } | |
| ty.error_reported()?; |
There was a problem hiding this comment.
That makes sense! I guess it kinda depends on if we're checking if the parameters are well-formed, or if it's all well-formed... while checking the const parameters.
Tests don't seem to mind either way, and there are no docs for any of these methods, so I'll go with this. 😄
(by the way, is there any reason behind the lack of docs on most rustc modules/items? would well-researched docs be appreciated?)
avoid `{type error}` being leaked in user-facing messages,
particularly when using the `adt_const_params` feature
onkoe
force-pushed
the
fix/adt_const_params_leak_118179
branch
from
081a8a8
to
c5598d6
Compare
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
| }; | ||
|
|
||
| diag.note("the only supported types are integers, `bool` and `char`"); | ||
| diag.note("the only supported types are integers, `bool`, and `char`"); |
There was a problem hiding this comment.
comma before and looks wrong to me.
There was a problem hiding this comment.
It's called the oxford comma.
There was a problem hiding this comment.
Hmm, okay, looking at *.stderr there used both cases with and w\o comma with enumerations.
One more wtf styling case. Probably exist somewhere in rust style guide for errors.
There was a problem hiding this comment.
Found only 2 mentions: rust-lang/rustc-dev-guide#1087 (comment), rust-lang/rustc-dev-guide#1139 (comment); should be added to the guide?
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#131023 (Copy correct path to clipboard for modules/keywords/primitives) - rust-lang#131035 (Preserve brackets around if-lets and skip while-lets) - rust-lang#131038 (Fix `adt_const_params` leaking `{type error}` in error msg) - rust-lang#131053 (Improve `--print=check-cfg` documentation) - rust-lang#131056 (enable compiler fingerprint logs in verbose mode) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#131038 - onkoe:fix/adt_const_params_leak_118179, r=compiler-errors Fix `adt_const_params` leaking `{type error}` in error msg Fixes the confusing diagnostic described in rust-lang#118179. (users would see `{type error}` in some situations, which is pretty weird) `adt_const_params` tracking issue: rust-lang#95174
we encountered this in rust-lang/rust#131038 kinda felt like an unspoken rule so here's a more concrete clarification.
we encountered this in rust-lang/rust#131038 kinda felt like an unspoken rule so here's a more concrete clarification.
Fixes the confusing diagnostic described in #118179. (users would see
{type error}in some situations, which is pretty weird)Fixes #118179.
adt_const_paramstracking issue: #95174