aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Poulhiès <dkm@kataplop.net>2022-12-17 16:23:05 +0100
committerPhilip Herron <philip.herron@embecosm.com>2023-03-10 12:45:46 +0000
commit2c1e7b55dab5564f92d890c4953f9fd387bb30d7 (patch)
treed72e85cce82306fd342ec272a19d96f4c65a6cfb
parent6f9938c712d6d8645714ee21d5850342281022e1 (diff)
downloadgcc-2c1e7b55dab5564f92d890c4953f9fd387bb30d7.zip
gcc-2c1e7b55dab5564f92d890c4953f9fd387bb30d7.tar.gz
gcc-2c1e7b55dab5564f92d890c4953f9fd387bb30d7.tar.bz2
gccrs: fix some clang warnings
This fixes some extra warnings reported by clang. gcc/rust/ChangeLog: PR rust/108111 * ast/rust-ast-full-decls.h (StructPatternElements): Declare as a class. * ast/rust-item.h (EnumItem): Mark several method as being overrides. * ast/rust-pattern.h (StructPattern::get_locus): Add override. * lex/rust-lex.h (BufferInputSource): Use reference_wrapper instead of bare reference. (TokenSource::get): Add method to implement the reference_wrapper interface. * typecheck/rust-tyty.h (TypeBoundPredicate): Add empty dtor. * util/rust-buffered-queue.h (peek): Source token stream is now using a reference_wrapper, use .get() Signed-off-by: Marc Poulhiès <dkm@kataplop.net>
-rw-r--r--gcc/rust/ast/rust-ast-full-decls.h2
-rw-r--r--gcc/rust/ast/rust-item.h10
-rw-r--r--gcc/rust/ast/rust-pattern.h2
-rw-r--r--gcc/rust/lex/rust-lex.h5
-rw-r--r--gcc/rust/typecheck/rust-tyty.h2
-rw-r--r--gcc/rust/util/rust-buffered-queue.h2
6 files changed, 14 insertions, 9 deletions
diff --git a/gcc/rust/ast/rust-ast-full-decls.h b/gcc/rust/ast/rust-ast-full-decls.h
index eafc82f..fee174b 100644
--- a/gcc/rust/ast/rust-ast-full-decls.h
+++ b/gcc/rust/ast/rust-ast-full-decls.h
@@ -240,7 +240,7 @@ class StructPatternField;
class StructPatternFieldTuplePat;
class StructPatternFieldIdentPat;
class StructPatternFieldIdent;
-struct StructPatternElements;
+class StructPatternElements;
class StructPattern;
class TupleStructItems;
class TupleStructItemsNoRange;
diff --git a/gcc/rust/ast/rust-item.h b/gcc/rust/ast/rust-item.h
index 065ca1e..2646c52 100644
--- a/gcc/rust/ast/rust-item.h
+++ b/gcc/rust/ast/rust-item.h
@@ -2210,18 +2210,18 @@ public:
return std::unique_ptr<EnumItem> (clone_item_impl ());
}
- virtual std::string as_string () const;
+ virtual std::string as_string () const override;
// not pure virtual as not abstract
- virtual void accept_vis (ASTVisitor &vis);
+ virtual void accept_vis (ASTVisitor &vis) override;
- Location get_locus () const { return locus; }
+ Location get_locus () const override { return locus; }
Identifier get_identifier () const { return variant_name; }
// Based on idea that name is never empty.
- void mark_for_strip () { variant_name = ""; }
- bool is_marked_for_strip () const { return variant_name.empty (); }
+ void mark_for_strip () override { variant_name = ""; }
+ bool is_marked_for_strip () const override { return variant_name.empty (); }
protected:
EnumItem *clone_item_impl () const override { return new EnumItem (*this); }
diff --git a/gcc/rust/ast/rust-pattern.h b/gcc/rust/ast/rust-pattern.h
index 0cc8425..079c7a9 100644
--- a/gcc/rust/ast/rust-pattern.h
+++ b/gcc/rust/ast/rust-pattern.h
@@ -919,7 +919,7 @@ public:
* is empty). */
bool has_struct_pattern_elems () const { return !elems.is_empty (); }
- Location get_locus () const { return path.get_locus (); }
+ Location get_locus () const override { return path.get_locus (); }
void accept_vis (ASTVisitor &vis) override;
diff --git a/gcc/rust/lex/rust-lex.h b/gcc/rust/lex/rust-lex.h
index 5042471..1400839 100644
--- a/gcc/rust/lex/rust-lex.h
+++ b/gcc/rust/lex/rust-lex.h
@@ -277,7 +277,7 @@ private:
// InputSource input_source;
// Input file queue.
std::unique_ptr<InputSource> raw_input_source;
- buffered_queue<int, InputSource &> input_queue;
+ buffered_queue<int, std::reference_wrapper<InputSource>> input_queue;
// Token source wrapper thing.
struct TokenSource
@@ -288,6 +288,9 @@ private:
// Create a new TokenSource with given lexer.
TokenSource (Lexer *parLexer) : lexer (parLexer) {}
+ // Used to mimic std::reference_wrapper that is used for InputSource.
+ TokenSource &get () { return *this; }
+
// Overload operator () to build token in lexer.
TokenPtr next () { return lexer->build_token (); }
};
diff --git a/gcc/rust/typecheck/rust-tyty.h b/gcc/rust/typecheck/rust-tyty.h
index b729437..7cd8673 100644
--- a/gcc/rust/typecheck/rust-tyty.h
+++ b/gcc/rust/typecheck/rust-tyty.h
@@ -387,6 +387,8 @@ public:
TypeBoundPredicate (const TypeBoundPredicate &other);
+ virtual ~TypeBoundPredicate (){};
+
TypeBoundPredicate &operator= (const TypeBoundPredicate &other);
static TypeBoundPredicate error ();
diff --git a/gcc/rust/util/rust-buffered-queue.h b/gcc/rust/util/rust-buffered-queue.h
index 20dd768..c3c30c6 100644
--- a/gcc/rust/util/rust-buffered-queue.h
+++ b/gcc/rust/util/rust-buffered-queue.h
@@ -102,7 +102,7 @@ public:
/* iterate through buffer and invoke operator () on source on values
* past original end */
for (int i = 0; i < num_items_to_read; i++)
- buffer[end + i] = source.next ();
+ buffer[end + i] = source.get ().next ();
// move end based on additional items added
end += num_items_to_read;