From: Arthur Cohen <arthur.co...@embecosm.com>

gcc/rust/ChangeLog:

        * expand/rust-derive-clone.h: Add missing override qualifiers to 
DeriveVisitor methods.
        * expand/rust-derive-copy.h: Likewise.
        * expand/rust-derive-eq.h: Likewise.
        * expand/rust-derive-hash.h: Likewise.
        * expand/rust-derive-partial-eq.h: Likewise.
---
 gcc/rust/expand/rust-derive-clone.h      | 10 +++++-----
 gcc/rust/expand/rust-derive-copy.h       |  8 ++++----
 gcc/rust/expand/rust-derive-eq.h         | 10 +++++-----
 gcc/rust/expand/rust-derive-hash.h       | 10 +++++-----
 gcc/rust/expand/rust-derive-partial-eq.h | 10 +++++-----
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/gcc/rust/expand/rust-derive-clone.h 
b/gcc/rust/expand/rust-derive-clone.h
index 61224ba527b..a3320c77f30 100644
--- a/gcc/rust/expand/rust-derive-clone.h
+++ b/gcc/rust/expand/rust-derive-clone.h
@@ -29,7 +29,7 @@ class DeriveClone : DeriveVisitor
 public:
   DeriveClone (location_t loc);
 
-  std::unique_ptr<AST::Item> go (Item &item);
+  std::unique_ptr<Item> go (Item &item);
 
 private:
   std::unique_ptr<Item> expanded;
@@ -80,10 +80,10 @@ private:
   MatchCase clone_enum_struct (PathInExpression variant_path,
                               const EnumItemStruct &variant);
 
-  virtual void visit_struct (StructStruct &item);
-  virtual void visit_tuple (TupleStruct &item);
-  virtual void visit_enum (Enum &item);
-  virtual void visit_union (Union &item);
+  virtual void visit_struct (StructStruct &item) override;
+  virtual void visit_tuple (TupleStruct &item) override;
+  virtual void visit_enum (Enum &item) override;
+  virtual void visit_union (Union &item) override;
 };
 
 } // namespace AST
diff --git a/gcc/rust/expand/rust-derive-copy.h 
b/gcc/rust/expand/rust-derive-copy.h
index 71972ebf6f7..664a8e0e290 100644
--- a/gcc/rust/expand/rust-derive-copy.h
+++ b/gcc/rust/expand/rust-derive-copy.h
@@ -44,10 +44,10 @@ private:
   copy_impl (std::string name,
             const std::vector<std::unique_ptr<GenericParam>> &type_generics);
 
-  virtual void visit_struct (StructStruct &item);
-  virtual void visit_tuple (TupleStruct &item);
-  virtual void visit_enum (Enum &item);
-  virtual void visit_union (Union &item);
+  virtual void visit_struct (StructStruct &item) override;
+  virtual void visit_tuple (TupleStruct &item) override;
+  virtual void visit_enum (Enum &item) override;
+  virtual void visit_union (Union &item) override;
 };
 
 } // namespace AST
diff --git a/gcc/rust/expand/rust-derive-eq.h b/gcc/rust/expand/rust-derive-eq.h
index 17af52653de..fb187ccb02c 100644
--- a/gcc/rust/expand/rust-derive-eq.h
+++ b/gcc/rust/expand/rust-derive-eq.h
@@ -31,7 +31,7 @@ class DeriveEq : DeriveVisitor
 public:
   DeriveEq (location_t loc);
 
-  std::vector<std::unique_ptr<AST::Item>> go (Item &item);
+  std::vector<std::unique_ptr<Item>> go (Item &item);
 
 private:
   std::vector<std::unique_ptr<Item>> expanded;
@@ -70,10 +70,10 @@ private:
    */
   std::unique_ptr<Stmt> assert_type_is_eq (std::unique_ptr<Type> &&type);
 
-  virtual void visit_struct (StructStruct &item);
-  virtual void visit_tuple (TupleStruct &item);
-  virtual void visit_enum (Enum &item);
-  virtual void visit_union (Union &item);
+  virtual void visit_struct (StructStruct &item) override;
+  virtual void visit_tuple (TupleStruct &item) override;
+  virtual void visit_enum (Enum &item) override;
+  virtual void visit_union (Union &item) override;
 };
 
 } // namespace AST
diff --git a/gcc/rust/expand/rust-derive-hash.h 
b/gcc/rust/expand/rust-derive-hash.h
index 02b0bee10a5..67170d0c8a0 100644
--- a/gcc/rust/expand/rust-derive-hash.h
+++ b/gcc/rust/expand/rust-derive-hash.h
@@ -29,7 +29,7 @@ class DeriveHash : DeriveVisitor
 public:
   DeriveHash (location_t loc);
 
-  std::unique_ptr<AST::Item> go (Item &item);
+  std::unique_ptr<Item> go (Item &item);
 
 private:
   std::unique_ptr<Item> expanded;
@@ -49,10 +49,10 @@ private:
   MatchCase match_enum_struct (PathInExpression variant_path,
                               const EnumItemStruct &variant);
 
-  virtual void visit_struct (StructStruct &item);
-  virtual void visit_tuple (TupleStruct &item);
-  virtual void visit_enum (Enum &item);
-  virtual void visit_union (Union &item);
+  virtual void visit_struct (StructStruct &item) override;
+  virtual void visit_tuple (TupleStruct &item) override;
+  virtual void visit_enum (Enum &item) override;
+  virtual void visit_union (Union &item) override;
 };
 
 } // namespace AST
diff --git a/gcc/rust/expand/rust-derive-partial-eq.h 
b/gcc/rust/expand/rust-derive-partial-eq.h
index ac963a63c8a..12d793d81bc 100644
--- a/gcc/rust/expand/rust-derive-partial-eq.h
+++ b/gcc/rust/expand/rust-derive-partial-eq.h
@@ -30,7 +30,7 @@ class DerivePartialEq : DeriveVisitor
 public:
   DerivePartialEq (location_t loc);
 
-  std::vector<std::unique_ptr<AST::Item>> go (Item &item);
+  std::vector<std::unique_ptr<Item>> go (Item &item);
 
 private:
   std::vector<std::unique_ptr<Item>> expanded;
@@ -73,10 +73,10 @@ private:
   MatchCase match_enum_struct (PathInExpression variant_path,
                               const EnumItemStruct &variant);
 
-  virtual void visit_struct (StructStruct &item);
-  virtual void visit_tuple (TupleStruct &item);
-  virtual void visit_enum (Enum &item);
-  virtual void visit_union (Union &item);
+  virtual void visit_struct (StructStruct &item) override;
+  virtual void visit_tuple (TupleStruct &item) override;
+  virtual void visit_enum (Enum &item) override;
+  virtual void visit_union (Union &item) override;
 };
 
 } // namespace AST
-- 
2.49.0

Reply via email to