Skip to content

derive: Implement reconstruct_path helper for cmp #4395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Pasta-coder wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −4
Draft

derive: Implement reconstruct_path helper for cmp #4395

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions gcc/rust/expand/rust-derive-cmp-common.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@
namespace Rust {
namespace AST {

static PathInExpression
reconstruct_path (const PathInExpression &path)
{
return PathInExpression (path.get_segments (), path.get_outer_attrs (),
path.get_locus (), path.opening_scope_resolution ());
}

SelfOther
SelfOther::index (Builder builder, int idx)
{
Expand Down Expand Up @@ -96,9 +103,8 @@ EnumMatchBuilder::tuple (EnumItem &variant_raw)
});
}

// TODO: Replace with `reconstruct()` instead of building these twice
auto self_variant_path = builder.variant_path (enum_path, variant_path);
auto other_variant_path = builder.variant_path (enum_path, variant_path);
auto other_variant_path = reconstruct_path (self_variant_path);

auto self_pattern_items = std::unique_ptr<TupleStructItems> (
new TupleStructItemsNoRest (std::move (self_patterns)));
Expand Down Expand Up @@ -159,9 +165,8 @@ EnumMatchBuilder::strukt (EnumItem &variant_raw)
});
}

// TODO: Replace with `reconstruct()` instead of building these twice
auto self_variant_path = builder.variant_path (enum_path, variant_path);
auto other_variant_path = builder.variant_path (enum_path, variant_path);
auto other_variant_path = reconstruct_path (self_variant_path);

auto self_elts = StructPatternElements (std::move (self_fields));
auto other_elts = StructPatternElements (std::move (other_fields));
Expand Down