Skip to content

Commit afbd873

Browse files
committed
hir: Remove duplicate function in TraitItemFunc
Both TraitItemFunc::has_definition() and TraitItemFunc::has_block_defined() were exactly the same implementation, so remove one. gcc/rust/ChangeLog: * hir/tree/rust-hir-item.h: Remove TraitItemFunc::has_block_defined() * backend/rust-compile-implitem.cc (CompileTraitItem::visit): Call TraitItemFunc::has_definition() instead. * checks/errors/rust-const-checker.cc (ConstChecker::visit): Likewise. * checks/errors/rust-hir-pattern-analysis.cc (PatternChecker::visit): Likewise. * checks/errors/rust-unsafe-checker.cc (UnsafeChecker::visit): Likewise. * typecheck/rust-hir-trait-resolve.cc (ResolveTraitItemToRef::visit): Likewise.
1 parent 10cc6e8 commit afbd873

6 files changed

+5
-7
lines changed

gcc/rust/backend/rust-compile-implitem.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ CompileTraitItem::visit (HIR::TraitItemConst &constant)
5757
void
5858
CompileTraitItem::visit (HIR::TraitItemFunc &func)
5959
{
60-
rust_assert (func.has_block_defined ());
60+
rust_assert (func.has_definition ());
6161

6262
rust_assert (concrete->get_kind () == TyTy::TypeKind::FNDEF);
6363
TyTy::FnType *fntype = static_cast<TyTy::FnType *> (concrete);

gcc/rust/checks/errors/rust-const-checker.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ ConstChecker::visit (StaticItem &static_item)
678678
void
679679
ConstChecker::visit (TraitItemFunc &item)
680680
{
681-
if (item.has_block_defined ())
681+
if (item.has_definition ())
682682
item.get_block_expr ().accept_vis (*this);
683683
}
684684

gcc/rust/checks/errors/rust-hir-pattern-analysis.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ PatternChecker::visit (StaticItem &static_item)
522522
void
523523
PatternChecker::visit (TraitItemFunc &item)
524524
{
525-
if (item.has_block_defined ())
525+
if (item.has_definition ())
526526
item.get_block_expr ().accept_vis (*this);
527527
}
528528

gcc/rust/checks/errors/rust-unsafe-checker.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ UnsafeChecker::visit (StaticItem &static_item)
776776
void
777777
UnsafeChecker::visit (TraitItemFunc &item)
778778
{
779-
if (item.has_block_defined ())
779+
if (item.has_definition ())
780780
item.get_block_expr ().accept_vis (*this);
781781
}
782782

gcc/rust/hir/tree/rust-hir-item.h

-2
Original file line numberDiff line numberDiff line change
@@ -1991,8 +1991,6 @@ class TraitItemFunc : public TraitItem
19911991

19921992
const TraitFunctionDecl &get_decl () const { return decl; }
19931993

1994-
bool has_block_defined () const { return block_expr != nullptr; }
1995-
19961994
BlockExpr &get_block_expr () { return *block_expr; }
19971995

19981996
const std::string trait_identifier () const override final

gcc/rust/typecheck/rust-hir-trait-resolve.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ResolveTraitItemToRef::visit (HIR::TraitItemFunc &fn)
6969
{
7070
// create trait-item-ref
7171
location_t locus = fn.get_locus ();
72-
bool is_optional = fn.has_block_defined ();
72+
bool is_optional = fn.has_definition ();
7373
std::string identifier = fn.get_decl ().get_function_name ().as_string ();
7474

7575
resolved = TraitItemReference (identifier, is_optional,

0 commit comments

Comments
 (0)