Fix pretty HIR for anon consts in diagnostics #123926
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
|
These commits modify the If this was unintentional then you should revert the changes before this PR is merged. |
compiler-errors
commented
Apr 14, 2024
| @@ -0,0 +1,9 @@ | |||
| error[E0533]: expected value, found struct variant `Struct<0>::Variant` | |||
There was a problem hiding this comment.
Used to print Struct<>::Variant
This comment has been minimized.
This comment has been minimized.
|
Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
fmease
reviewed
Apr 14, 2024
| @@ -24,7 +24,9 @@ LL - let str::<{fn str() { let str::T>>::as_bytes; }}, T>::as_bytes; | |||
| LL + let str::as_bytes; | |||
| | | |||
|
|
|||
| error[E0533]: expected unit struct, unit variant or constant, found associated function `str<, T>::as_bytes` | |||
| error[E0533]: expected unit struct, unit variant or constant, found associated function `str<{ | |||
| fn str() { let (/*ERROR*/); } | |||
There was a problem hiding this comment.
Interestingly this seems to be the first time we leak pp's /*ERROR*/ in error messages.
At least according to rg -F '/*ERROR*/' -g 'tests/**/*.stderr'.
There was a problem hiding this comment.
For follow-up: Would it make sense to only print function signatures in const items in types instead of including their body? What is the output with
fn main() {
let str::<{fn str<T>() { let _; }}, T>::as_bytes;
}
Nice of you to make a distinction between our users and fuzzers, I'm not so sure that an edge case will be hit by one and not the other ^_^ @bors r+ |
bors
added
S-waiting-on-bors
|
@bors r- land after other pr |
bors
added
S-waiting-on-author
|
@bors r=estebank |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 16, 2024
Rollup of 7 pull requests Successful merges: - rust-lang#123016 (Remove `TypeVariableOriginKind` and `ConstVariableOriginKind`) - rust-lang#123462 (Cleanup: Rename `ModSep` to `PathSep`) - rust-lang#123603 (Don't even parse an intrinsic unless the feature gate is enabled) - rust-lang#123926 (Fix pretty HIR for anon consts in diagnostics) - rust-lang#123973 (crashes: readme: add reminder to add Fixes #abcde to prs to automatically close issues.) - rust-lang#123984 (sanitizers: Add rustc_sanitizers to triagebot.toml) - rust-lang#123989 (Just use `type_dependent_def_id` to figure out what the method is for an expr) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 16, 2024
Rollup merge of rust-lang#123926 - compiler-errors:no-ann, r=estebank Fix pretty HIR for anon consts in diagnostics This removes the `NoAnn` printer which skips over nested bodies altogether, which is confusing, and requires users of `{ty|qpath|pat}_to_string` to pass in `&tcx` which now impleemnts `hir_pretty::PpAnn`. There's one case where this "regresses" by actually printing out the body of the anon const -- we could suppress that, but I don't expect people to actually get anon consts like that unless they're fuzzing, tbh. r? estebank
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Apr 18, 2024
Fix pretty HIR for anon consts in diagnostics
This removes the `NoAnn` printer which skips over nested bodies altogether, which is confusing, and requires users of `{ty|qpath|pat}_to_string` to pass in `&tcx` which now impleemnts `hir_pretty::PpAnn`.
There's one case where this "regresses" by actually printing out the body of the anon const -- we could suppress that, but I don't expect people to actually get anon consts like that unless they're fuzzing, tbh.
r? estebank
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This removes the
NoAnnprinter which skips over nested bodies altogether, which is confusing, and requires users of{ty|qpath|pat}_to_stringto pass in&tcxwhich now impleemntshir_pretty::PpAnn.There's one case where this "regresses" by actually printing out the body of the anon const -- we could suppress that, but I don't expect people to actually get anon consts like that unless they're fuzzing, tbh.
r? estebank