Give VariantData::Struct named fields, to clairfy recovered.
#119145
Merged
Conversation
This file contains hidden or 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
|
Some changes occurred in src/tools/rustfmt cc @rust-lang/rustfmt Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
This comment has been minimized.
This comment has been minimized.
src/tools/rustfmt/src/items.rs
Outdated
| @@ -666,7 +666,7 @@ impl<'a> FmtVisitor<'a> { | |||
| let span = mk_sp(lo, field.span.lo()); | |||
|
|
|||
| let variant_body = match field.data { | |||
| ast::VariantData::Tuple(..) | ast::VariantData::Struct(..) => format_struct( | |||
| ast::VariantData::Tuple(..) | ast::VariantData::Struct{..} => format_struct( | |||
There was a problem hiding this comment.
I wonder if this will fail the rustfmt test where it tries to format itself...
src/tools/rustfmt/src/items.rs
Outdated
| @@ -666,7 +666,7 @@ impl<'a> FmtVisitor<'a> { | |||
| let span = mk_sp(lo, field.span.lo()); | |||
|
|
|||
| let variant_body = match field.data { | |||
| ast::VariantData::Tuple(..) | ast::VariantData::Struct(..) => format_struct( | |||
| ast::VariantData::Tuple(..) | ast::VariantData::Struct{..} => format_struct( | |||
There was a problem hiding this comment.
Suggested change
| ast::VariantData::Tuple(..) | ast::VariantData::Struct{..} => format_struct( | |
| ast::VariantData::Tuple(..) | ast::VariantData::Struct { .. } => format_struct( |
There was a problem hiding this comment.
Weird that the tidy pre-push hook didn't catch this.
rust-cloud-vms
bot
force-pushed
the
variantdata-struct-struct
branch
from
1940436 to
67fdabd
Compare
This comment has been minimized.
This comment has been minimized.
rust-cloud-vms
bot
force-pushed
the
variantdata-struct-struct
branch
from
67fdabd to
bb05f91
Compare
This comment has been minimized.
This comment has been minimized.
|
hint: |
rust-cloud-vms
bot
force-pushed
the
variantdata-struct-struct
branch
from
bb05f91 to
1133780
Compare
|
@bors r=compiler-errors rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 21, 2023
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#119135 (Fix crash due to `CrateItem::kind()` not handling constructors) - rust-lang#119141 (Add method to get instance instantiation arguments) - rust-lang#119145 (Give `VariantData::Struct` named fields, to clairfy `recovered`.) - rust-lang#119167 (E0761: module directory has .rs suffix) - rust-lang#119168 (resolve: Stop feeding visibilities for import list stems) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 21, 2023
Rollup merge of rust-lang#119145 - aDotInTheVoid:variantdata-struct-struct, r=compiler-errors Give `VariantData::Struct` named fields, to clairfy `recovered`. Implements rust-lang#119121 (comment). Supersedes rust-lang#119121 This way, it's clear what the bool fields means, instead of having to find where it's generated. Changes both ast and hir. r? `@compiler-errors`
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.
Implements #119121 (comment). Supersedes #119121
This way, it's clear what the bool fields means, instead of having to find where it's generated. Changes both ast and hir.
r? @compiler-errors