From: Arthur Cohen <[email protected]>
Inherit directly from ExprWithoutBlock instead.
gcc/rust/ChangeLog:
* ast/rust-ast.h (class PathExpr): Remove class.
* ast/rust-path.h (class PathInExpression): Inherit from
ExprWithoutBlock.
(class QualifiedPathInExpression): Likewise.
---
gcc/rust/ast/rust-ast.h | 5 -----
gcc/rust/ast/rust-path.h | 4 ++--
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/gcc/rust/ast/rust-ast.h b/gcc/rust/ast/rust-ast.h
index 4f40efff2a9..f5a2e77af3f 100644
--- a/gcc/rust/ast/rust-ast.h
+++ b/gcc/rust/ast/rust-ast.h
@@ -2048,11 +2048,6 @@ public:
}
};
-// Base path expression AST node - abstract
-class PathExpr : public ExprWithoutBlock
-{
-};
-
} // namespace AST
} // namespace Rust
diff --git a/gcc/rust/ast/rust-path.h b/gcc/rust/ast/rust-path.h
index 53ccf1dbb6b..bf758018b58 100644
--- a/gcc/rust/ast/rust-path.h
+++ b/gcc/rust/ast/rust-path.h
@@ -597,7 +597,7 @@ public:
/* AST node representing a path-in-expression pattern (path that allows
* generic arguments) */
-class PathInExpression : public PathPattern, public PathExpr
+class PathInExpression : public PathPattern, public ExprWithoutBlock
{
std::vector<Attribute> outer_attrs;
bool has_opening_scope_resolution;
@@ -1221,7 +1221,7 @@ public:
/* AST node representing a qualified path-in-expression pattern (path that
* allows specifying trait functions) */
-class QualifiedPathInExpression : public PathPattern, public PathExpr
+class QualifiedPathInExpression : public PathPattern, public ExprWithoutBlock
{
std::vector<Attribute> outer_attrs;
QualifiedPathType path_type;
--
2.45.2