Skip to content

Commit c8ee62e

Browse files
committed
Replace TupleType::iterate_fields with get_fields
Fixes #735 Signed-off-by: Connor Lane Smith <cls@lubutu.com>
1 parent 5f0df48 commit c8ee62e

2 files changed

Lines changed: 6 additions & 13 deletions

File tree

gcc/rust/typecheck/rust-tyty.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -788,11 +788,11 @@ std::string
788788
TupleType::as_string () const
789789
{
790790
std::string fields_buffer;
791-
iterate_fields ([&] (BaseType *field) mutable -> bool {
792-
fields_buffer += field->as_string ();
793-
fields_buffer += ", ";
794-
return true;
795-
});
791+
for (const TyVar &field : get_fields ())
792+
{
793+
fields_buffer += field.get_tyty ()->as_string ();
794+
fields_buffer += ", ";
795+
}
796796
return "(" + fields_buffer + ")";
797797
}
798798

gcc/rust/typecheck/rust-tyty.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -642,14 +642,7 @@ class TupleType : public BaseType
642642
return true;
643643
}
644644

645-
void iterate_fields (std::function<bool (BaseType *)> cb) const
646-
{
647-
for (size_t i = 0; i < num_fields (); i++)
648-
{
649-
if (!cb (get_field (i)))
650-
return;
651-
}
652-
}
645+
const std::vector<TyVar> &get_fields () const { return fields; }
653646

654647
std::string get_name () const override final { return as_string (); }
655648

0 commit comments

Comments
 (0)