From: Owen Avery Date: Wed, 15 Feb 2023 15:04:32 +0000 (-0500) Subject: gccrs: Fix formatting X-Git-Tag: basepoints/gcc-14~104 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6774d569c61cb0cc80fc9e809cd92dda0010c9c3;p=thirdparty%2Fgcc.git gccrs: Fix formatting gcc/rust/ChangeLog: * ast/rust-pattern.h: Fix formatting. Signed-off-by: Owen Avery --- diff --git a/gcc/rust/ast/rust-pattern.h b/gcc/rust/ast/rust-pattern.h index cf5d2ead10d5..0e2f56e32164 100644 --- a/gcc/rust/ast/rust-pattern.h +++ b/gcc/rust/ast/rust-pattern.h @@ -763,7 +763,7 @@ struct StructPatternElements { private: // bool has_struct_pattern_fields; - std::vector > fields; + std::vector> fields; bool has_struct_pattern_etc; std::vector struct_pattern_etc_attrs; @@ -788,7 +788,7 @@ public: // Constructor for StructPatternElements with both (potentially) StructPatternElements ( - std::vector > fields, + std::vector> fields, std::vector etc_attrs) : fields (std::move (fields)), has_struct_pattern_etc (true), struct_pattern_etc_attrs (std::move (etc_attrs)) @@ -796,7 +796,7 @@ public: // Constructor for StructPatternElements with no StructPatternEtc StructPatternElements ( - std::vector > fields) + std::vector> fields) : fields (std::move (fields)), has_struct_pattern_etc (false), struct_pattern_etc_attrs () {} @@ -832,18 +832,17 @@ public: static StructPatternElements create_empty () { return StructPatternElements ( - std::vector > ()); + std::vector> ()); } std::string as_string () const; // TODO: seems kinda dodgy. Think of better way. - std::vector > & - get_struct_pattern_fields () + std::vector> &get_struct_pattern_fields () { return fields; } - const std::vector > & + const std::vector> & get_struct_pattern_fields () const { return fields; @@ -956,10 +955,10 @@ protected: // Class for non-ranged tuple struct pattern patterns class TupleStructItemsNoRange : public TupleStructItems { - std::vector > patterns; + std::vector> patterns; public: - TupleStructItemsNoRange (std::vector > patterns) + TupleStructItemsNoRange (std::vector> patterns) : patterns (std::move (patterns)) {} @@ -991,8 +990,8 @@ public: void accept_vis (ASTVisitor &vis) override; // TODO: seems kinda dodgy. Think of better way. - std::vector > &get_patterns () { return patterns; } - const std::vector > &get_patterns () const + std::vector> &get_patterns () { return patterns; } + const std::vector> &get_patterns () const { return patterns; } @@ -1011,12 +1010,12 @@ protected: // Class for ranged tuple struct pattern patterns class TupleStructItemsRange : public TupleStructItems { - std::vector > lower_patterns; - std::vector > upper_patterns; + std::vector> lower_patterns; + std::vector> upper_patterns; public: - TupleStructItemsRange (std::vector > lower_patterns, - std::vector > upper_patterns) + TupleStructItemsRange (std::vector> lower_patterns, + std::vector> upper_patterns) : lower_patterns (std::move (lower_patterns)), upper_patterns (std::move (upper_patterns)) {} @@ -1056,21 +1055,21 @@ public: void accept_vis (ASTVisitor &vis) override; // TODO: seems kinda dodgy. Think of better way. - std::vector > &get_lower_patterns () + std::vector> &get_lower_patterns () { return lower_patterns; } - const std::vector > &get_lower_patterns () const + const std::vector> &get_lower_patterns () const { return lower_patterns; } // TODO: seems kinda dodgy. Think of better way. - std::vector > &get_upper_patterns () + std::vector> &get_upper_patterns () { return upper_patterns; } - const std::vector > &get_upper_patterns () const + const std::vector> &get_upper_patterns () const { return upper_patterns; } @@ -1233,10 +1232,10 @@ TuplePatternItemsSingle(*this); // Class representing TuplePattern patterns where there are multiple patterns class TuplePatternItemsMultiple : public TuplePatternItems { - std::vector > patterns; + std::vector> patterns; public: - TuplePatternItemsMultiple (std::vector > patterns) + TuplePatternItemsMultiple (std::vector> patterns) : patterns (std::move (patterns)) {} @@ -1268,8 +1267,8 @@ public: void accept_vis (ASTVisitor &vis) override; // TODO: seems kinda dodgy. Think of better way. - std::vector > &get_patterns () { return patterns; } - const std::vector > &get_patterns () const + std::vector> &get_patterns () { return patterns; } + const std::vector> &get_patterns () const { return patterns; } @@ -1291,13 +1290,12 @@ protected: // Class representing TuplePattern patterns where there are a range of patterns class TuplePatternItemsRanged : public TuplePatternItems { - std::vector > lower_patterns; - std::vector > upper_patterns; + std::vector> lower_patterns; + std::vector> upper_patterns; public: - TuplePatternItemsRanged ( - std::vector > lower_patterns, - std::vector > upper_patterns) + TuplePatternItemsRanged (std::vector> lower_patterns, + std::vector> upper_patterns) : lower_patterns (std::move (lower_patterns)), upper_patterns (std::move (upper_patterns)) {} @@ -1338,21 +1336,21 @@ public: void accept_vis (ASTVisitor &vis) override; // TODO: seems kinda dodgy. Think of better way. - std::vector > &get_lower_patterns () + std::vector> &get_lower_patterns () { return lower_patterns; } - const std::vector > &get_lower_patterns () const + const std::vector> &get_lower_patterns () const { return lower_patterns; } // TODO: seems kinda dodgy. Think of better way. - std::vector > &get_upper_patterns () + std::vector> &get_upper_patterns () { return upper_patterns; } - const std::vector > &get_upper_patterns () const + const std::vector> &get_upper_patterns () const { return upper_patterns; } @@ -1503,14 +1501,14 @@ protected: // AST node representing patterns that can match slices and arrays class SlicePattern : public Pattern { - std::vector > items; + std::vector> items; Location locus; NodeId node_id; public: std::string as_string () const override; - SlicePattern (std::vector > items, Location locus) + SlicePattern (std::vector> items, Location locus) : items (std::move (items)), locus (locus), node_id (Analysis::Mappings::get ()->get_next_node_id ()) {} @@ -1546,8 +1544,8 @@ public: void accept_vis (ASTVisitor &vis) override; // TODO: seems kinda dodgy. Think of better way. - std::vector > &get_items () { return items; } - const std::vector > &get_items () const + std::vector> &get_items () { return items; } + const std::vector> &get_items () const { return items; }