From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id BAE5D3858417; Sun, 5 Mar 2023 11:40:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BAE5D3858417 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678016443; bh=dAtnhfNbILTJ+LritGpVwL4OJouCdyaYMzS43vpQi2k=; h=From:To:Subject:Date:From; b=ViOmENU/aTbsgolK+bBqEJdwc6N8FZv+8b8iL1lHTgKoYT38nEGvDiVrWhvB3qzbf CHpTVeBMp8u5EP6sSuwUAqt5AbTm1sObUtDFUyLq8xBhwyMT4BwPhDWSHU8HJhn6Re 24yL7Kh2YidjnGT8of6qZcr7kknmoupOTnKKwKGs= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Fix formatting X-Act-Checkin: gcc X-Git-Author: Owen Avery X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: c2a3b370a9f42846f7d82512719d4127fa3fca4b X-Git-Newrev: 0cf0a7b8fcf00b653816e981b53ba25ac38607f1 Message-Id: <20230305114043.BAE5D3858417@sourceware.org> Date: Sun, 5 Mar 2023 11:40:43 +0000 (GMT) List-Id: https://gcc.gnu.org/g:0cf0a7b8fcf00b653816e981b53ba25ac38607f1 commit 0cf0a7b8fcf00b653816e981b53ba25ac38607f1 Author: Owen Avery Date: Mon Feb 20 16:05:41 2023 -0500 Fix formatting gcc/rust/ChangeLog: * hir/tree/rust-hir-pattern.h (class TupleStructItemsNoRange): Fix formatting. (class TupleStructItemsRange): Fix formatting. (class TuplePatternItemsMultiple): Fix formatting. (class TuplePatternItemsRanged): Fix formatting. (class SlicePattern): Fix formatting. Signed-off-by: Owen Avery Diff: --- gcc/rust/hir/tree/rust-hir-pattern.h | 62 +++++++++++++++++------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/gcc/rust/hir/tree/rust-hir-pattern.h b/gcc/rust/hir/tree/rust-hir-pattern.h index 1b08ab88a34..ead6cafc903 100644 --- a/gcc/rust/hir/tree/rust-hir-pattern.h +++ b/gcc/rust/hir/tree/rust-hir-pattern.h @@ -670,7 +670,7 @@ protected: struct StructPatternElements { private: - std::vector > fields; + std::vector> fields; public: // Returns whether there are any struct pattern fields @@ -682,7 +682,7 @@ public: // Constructor for StructPatternElements with both (potentially) StructPatternElements ( - std::vector > fields) + std::vector> fields) : fields (std::move (fields)) {} @@ -712,13 +712,12 @@ public: static StructPatternElements create_empty () { return StructPatternElements ( - std::vector > ()); + std::vector> ()); } std::string as_string () const; - std::vector > & - get_struct_pattern_fields () + std::vector> &get_struct_pattern_fields () { return fields; } @@ -803,10 +802,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)) {} @@ -837,8 +836,8 @@ public: void accept_vis (HIRFullVisitor &vis) override; - 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; } @@ -857,12 +856,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)) {} @@ -901,21 +900,21 @@ public: void accept_vis (HIRFullVisitor &vis) override; - 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; } @@ -1034,10 +1033,10 @@ protected: // 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)) {} @@ -1073,8 +1072,8 @@ public: return TuplePatternItemType::MULTIPLE; } - 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; } @@ -1091,13 +1090,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)) {} @@ -1142,20 +1140,20 @@ public: return TuplePatternItemType::RANGED; } - 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; } - 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,7 +1231,7 @@ protected: // HIR node representing patterns that can match slices and arrays class SlicePattern : public Pattern { - std::vector > items; + std::vector> items; Location locus; Analysis::NodeMapping mappings; @@ -1241,7 +1239,7 @@ public: std::string as_string () const override; SlicePattern (Analysis::NodeMapping mappings, - std::vector > items, Location locus) + std::vector> items, Location locus) : items (std::move (items)), locus (locus), mappings (mappings) {}