Finish derive(Clone) for enums
#3343
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
CohenArthur
force-pushed
the
finish-derive-clone
branch
2 times, most recently
from
dc29897 to
d953618
Compare
CohenArthur
force-pushed
the
finish-derive-clone
branch
2 times, most recently
from
2087be9 to
f9a15c5
Compare
This was referenced Jan 15, 2025
CohenArthur
force-pushed
the
finish-derive-clone
branch
from
f9a15c5 to
edaebb7
Compare
CohenArthur
force-pushed
the
finish-derive-clone
branch
2 times, most recently
from
d1f38dd to
b6104c1
Compare
gcc/testsuite/ChangeLog: * rust/compile/derive_macro1.rs: Add #[lang = "clone"] to Clone trait. * rust/compile/derive_macro3.rs: Likewise. * rust/compile/derive_macro6.rs: Likewise. * rust/execute/torture/derive_macro3.rs: Likewise.
gcc/rust/ChangeLog: * ast/rust-ast-builder.cc (Builder::struct_struct): New function. * ast/rust-ast-builder.h (vec): New function.
gcc/rust/ChangeLog: * expand/rust-derive-clone.cc (DeriveClone::visit_union): Manually generate the struct used for asserting a union implements Copy.
gcc/testsuite/ChangeLog: * rust/compile/derive_macro4.rs: Make PhantomData a lang item.
gcc/rust/ChangeLog: * expand/rust-derive-copy.cc: Use lang item path.
gcc/rust/ChangeLog: * ast/rust-ast-builder.cc: New functions. * ast/rust-ast-builder.h: Declare them.
gcc/rust/ChangeLog: * expand/rust-derive-clone.cc (DeriveClone::visit_union): Create a lang item path instead of a regular path.
gcc/rust/ChangeLog: * expand/rust-derive-clone.cc (DeriveClone::clone_call): Mention using `clone_fn` lang item in the future.
gcc/testsuite/ChangeLog: * rust/compile/derive_macro4.rs: Mark Copy and Clone as lang items.
gcc/rust/ChangeLog: * expand/rust-derive-clone.cc: Clone enum identifier variants properly * expand/rust-derive-clone.h: Declare new functions used.
gcc/rust/ChangeLog: * ast/rust-ast-builder.cc: Add new methods for constructing struct exprs. * ast/rust-ast-builder.h: Mention how to build tuple expressions.
gcc/rust/ChangeLog: * expand/rust-derive-clone.cc (DeriveClone::variant_match_path): New function. (DeriveClone::clone_enum_identifier): Rename. (DeriveClone::clone_enum_tuple): New function. (DeriveClone::visit_enum): Visit tuple variants properly. * expand/rust-derive-clone.h: Declare new functions.
gcc/rust/ChangeLog: * expand/rust-derive-clone.cc (DeriveClone::clone_enum_struct): New function for deriving enum struct variants. (DeriveClone::visit_enum): Call into the new function. gcc/testsuite/ChangeLog: * rust/compile/nr2/exclude: * rust/compile/derive_clone_enum1.rs: New test. * rust/compile/derive_clone_enum2.rs: New test. * rust/compile/derive_clone_enum3.rs: New test. * rust/execute/torture/derive_clone_enum1.rs: New test.
gcc/testsuite/ChangeLog: * rust/compile/nr2/exclude: Add failing lang item typepaths tests. * rust/execute/torture/derive_macro4.rs: Mark Clone as lang item.
gcc/rust/ChangeLog: * resolve/rust-late-name-resolver-2.0.cc (Late::visit): Improve formatting.
CohenArthur
force-pushed
the
finish-derive-clone
branch
2 times, most recently
from
b01380b to
49f5d2d
Compare
CohenArthur
commented
Jan 20, 2025
Comment on lines
+30
to
+51
| template <typename T> | ||
| std::vector<std::unique_ptr<T>> | ||
| vec (std::unique_ptr<T> &&t) | ||
| { | ||
| auto v = std::vector<std::unique_ptr<T>> (); | ||
|
|
||
| v.emplace_back (std::move (t)); | ||
|
|
||
| return v; | ||
| } | ||
|
|
||
| template <typename T> | ||
| std::vector<std::unique_ptr<T>> | ||
| vec (std::unique_ptr<T> &&t1, std::unique_ptr<T> &&t2) | ||
| { | ||
| auto v = std::vector<std::unique_ptr<T>> (); | ||
|
|
||
| v.emplace_back (std::move (t1)); | ||
| v.emplace_back (std::move (t2)); | ||
|
|
||
| return v; | ||
| } |
There was a problem hiding this comment.
this should probably be just one variadic function?
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 PR changes how lang item paths are handled and subsequently finishes the implementation of
derive(Clone)for enums and their variants. Putting it as a draft since it's a mess and needs cleaning up. Addresses #2996, but we still need to properly implement generic Clone I think?I might instead split this up in multiple PRs to first refactor the lang item paths and then finish implementing
derive(Clone)on top of it - next week.Needs #3366