Skip to content

Commit 2925eaa

Browse files
committed
Delete GetFunctionPointerDefaultAsString
1 parent 7a5ba3d commit 2925eaa

4 files changed

Lines changed: 2 additions & 18 deletions

File tree

cpp2rust/converter/converter.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2645,15 +2645,10 @@ bool Converter::VisitCXXStdInitializerListExpr(
26452645
return false;
26462646
}
26472647

2648-
std::string
2649-
Converter::GetFunctionPointerDefaultAsString(clang::QualType qual_type) {
2650-
return "None";
2651-
}
2652-
26532648
std::string Converter::GetDefaultAsString(clang::QualType qual_type) {
26542649
if (qual_type->isPointerType()) {
26552650
if (qual_type->getPointeeType()->isFunctionType()) {
2656-
return GetFunctionPointerDefaultAsString(qual_type);
2651+
return "None";
26572652
} else {
26582653
computed_expr_type_ = ComputedExprType::FreshPointer;
26592654
return keyword_default_;

cpp2rust/converter/converter.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,6 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
338338
virtual bool Convert(clang::Stmt *stmt);
339339
virtual bool Convert(clang::Expr *expr);
340340

341-
virtual std::string
342-
GetFunctionPointerDefaultAsString(clang::QualType qual_type);
343-
344341
virtual std::string GetDefaultAsString(clang::QualType qual_type);
345342

346343
virtual std::string GetDefaultAsStringFallback(clang::QualType qual_type);

cpp2rust/converter/models/converter_refcount.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,11 +1035,6 @@ void ConverterRefCount::ConvertFunctionToFunctionPointer(
10351035
fn_decl->getType()->getAs<clang::FunctionProtoType>())));
10361036
}
10371037

1038-
std::string ConverterRefCount::GetFunctionPointerDefaultAsString(
1039-
clang::QualType qual_type) {
1040-
return "FnPtr::null()";
1041-
}
1042-
10431038
void ConverterRefCount::ConvertEqualsNullPtr(clang::Expr *expr) {
10441039
StrCat("(");
10451040
Convert(expr);
@@ -1553,7 +1548,7 @@ std::string ConverterRefCount::GetDefaultAsString(clang::QualType qual_type) {
15531548
if (qual_type->isPointerType()) {
15541549
auto pointee_type = qual_type->getPointeeType();
15551550
if (pointee_type->isFunctionType()) {
1556-
ret = GetFunctionPointerDefaultAsString(qual_type);
1551+
ret = "FnPtr::null()";
15571552
} else {
15581553
if (pointee_type->isVoidType()) {
15591554
ret = "AnyPtr::default()";

cpp2rust/converter/models/converter_refcount.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,6 @@ class ConverterRefCount final : public Converter {
113113

114114
std::string GetDefaultAsString(clang::QualType qual_type) override;
115115

116-
std::string
117-
GetFunctionPointerDefaultAsString(clang::QualType qual_type) override;
118-
119116
void ConvertEqualsNullPtr(clang::Expr *expr) override;
120117

121118
std::string GetDefaultAsStringFallback(clang::QualType qual_type) override;

0 commit comments

Comments
 (0)