Fix json tuple struct enum variant #88391
Merged
bors merged 2 commits intorust-lang:masterfrom Aug 31, 2021
Merged
Conversation
This comment has been minimized.
This comment has been minimized.
4a54a93 to
e483f72
Compare
notriddle
approved these changes
Aug 27, 2021
camelid
reviewed
Aug 27, 2021
camelid
reviewed
Aug 27, 2021
camelid
reviewed
Aug 27, 2021
camelid
reviewed
Aug 27, 2021
e483f72 to
073ebfb
Compare
GuillaumeGomez
commented
Aug 28, 2021
Member
Author
|
Updated! I replaced the |
camelid
reviewed
Aug 28, 2021
073ebfb to
a521388
Compare
Member
Author
|
Updated! |
camelid
reviewed
Aug 30, 2021
| @@ -56,6 +56,10 @@ crate trait DocFolder: Sized { | |||
| || j.fields.iter().any(|f| f.is_stripped()); | |||
Member
There was a problem hiding this comment.
[Self note (for future):] We can probably remove this part because variant fields always have inherited visibility.
Comment on lines
+96
to
+97
| // Variant fields have inherited visibility | ||
| clean::VariantItem(clean::Variant::Struct(..) | clean::Variant::Tuple(..)) => true, |
Member
There was a problem hiding this comment.
This seems like an unrelated—but still good—fix, right?
Member
Author
There was a problem hiding this comment.
Ah indeed, didn't even pay attention. But yes, bug fix! :)
Member
There was a problem hiding this comment.
Or actually it shouldn't have any effect on behavior, but it is a performance fix :)
Member
|
@bors r=camelid,notriddle |
Collaborator
|
📌 Commit a521388 has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 31, 2021
Rollup of 10 pull requests Successful merges: - rust-lang#85017 (Add carrying_add, borrowing_sub, widening_mul, carrying_mul methods to integers) - rust-lang#86362 (Avoid cloning LocalDecls) - rust-lang#88391 (Fix json tuple struct enum variant ) - rust-lang#88399 (Disallow the aapcs CC on Aarch64) - rust-lang#88418 (Allow `~const` bounds on trait assoc functions) - rust-lang#88445 (Clean up the lowering of AST items) - rust-lang#88495 (Add `TcpStream::set_linger` and `TcpStream::linger`) - rust-lang#88501 (Use right span in prelude collision suggestions with macros. ) - rust-lang#88504 (Keep turbofish in prelude collision lint.) - rust-lang#88524 (Remove unnecessary `mut` from udp doctests) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
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.
Fixes #87887.
cc @dsherret @camelid
r? @notriddle