[gcc r14-7311] gccrs: Fix formatting
Arthur Cohen
cohenarthur@gcc.gnu.org
Tue Jan 16 17:21:36 GMT 2024
https://gcc.gnu.org/g:9c4beccae3cf6e43deff1c08b8e35ac39ccc7efc
commit r14-7311-g9c4beccae3cf6e43deff1c08b8e35ac39ccc7efc
Author: Owen Avery <powerboat9.gamer@gmail.com>
Date: Mon Feb 20 16:05:41 2023 -0500
gccrs: 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 <powerboat9.gamer@gmail.com>
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 8a077b7ac93..0c6cccef7d5 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<std::unique_ptr<StructPatternField> > fields;
+ std::vector<std::unique_ptr<StructPatternField>> fields;
public:
// Returns whether there are any struct pattern fields
@@ -682,7 +682,7 @@ public:
// Constructor for StructPatternElements with both (potentially)
StructPatternElements (
- std::vector<std::unique_ptr<StructPatternField> > fields)
+ std::vector<std::unique_ptr<StructPatternField>> fields)
: fields (std::move (fields))
{}
@@ -712,13 +712,12 @@ public:
static StructPatternElements create_empty ()
{
return StructPatternElements (
- std::vector<std::unique_ptr<StructPatternField> > ());
+ std::vector<std::unique_ptr<StructPatternField>> ());
}
std::string as_string () const;
- std::vector<std::unique_ptr<StructPatternField> > &
- get_struct_pattern_fields ()
+ std::vector<std::unique_ptr<StructPatternField>> &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<std::unique_ptr<Pattern> > patterns;
+ std::vector<std::unique_ptr<Pattern>> patterns;
public:
- TupleStructItemsNoRange (std::vector<std::unique_ptr<Pattern> > patterns)
+ TupleStructItemsNoRange (std::vector<std::unique_ptr<Pattern>> patterns)
: patterns (std::move (patterns))
{}
@@ -837,8 +836,8 @@ public:
void accept_vis (HIRFullVisitor &vis) override;
- std::vector<std::unique_ptr<Pattern> > &get_patterns () { return patterns; }
- const std::vector<std::unique_ptr<Pattern> > &get_patterns () const
+ std::vector<std::unique_ptr<Pattern>> &get_patterns () { return patterns; }
+ const std::vector<std::unique_ptr<Pattern>> &get_patterns () const
{
return patterns;
}
@@ -857,12 +856,12 @@ protected:
// Class for ranged tuple struct pattern patterns
class TupleStructItemsRange : public TupleStructItems
{
- std::vector<std::unique_ptr<Pattern> > lower_patterns;
- std::vector<std::unique_ptr<Pattern> > upper_patterns;
+ std::vector<std::unique_ptr<Pattern>> lower_patterns;
+ std::vector<std::unique_ptr<Pattern>> upper_patterns;
public:
- TupleStructItemsRange (std::vector<std::unique_ptr<Pattern> > lower_patterns,
- std::vector<std::unique_ptr<Pattern> > upper_patterns)
+ TupleStructItemsRange (std::vector<std::unique_ptr<Pattern>> lower_patterns,
+ std::vector<std::unique_ptr<Pattern>> 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<std::unique_ptr<Pattern> > &get_lower_patterns ()
+ std::vector<std::unique_ptr<Pattern>> &get_lower_patterns ()
{
return lower_patterns;
}
- const std::vector<std::unique_ptr<Pattern> > &get_lower_patterns () const
+ const std::vector<std::unique_ptr<Pattern>> &get_lower_patterns () const
{
return lower_patterns;
}
// TODO: seems kinda dodgy. Think of better way.
- std::vector<std::unique_ptr<Pattern> > &get_upper_patterns ()
+ std::vector<std::unique_ptr<Pattern>> &get_upper_patterns ()
{
return upper_patterns;
}
- const std::vector<std::unique_ptr<Pattern> > &get_upper_patterns () const
+ const std::vector<std::unique_ptr<Pattern>> &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<std::unique_ptr<Pattern> > patterns;
+ std::vector<std::unique_ptr<Pattern>> patterns;
public:
- TuplePatternItemsMultiple (std::vector<std::unique_ptr<Pattern> > patterns)
+ TuplePatternItemsMultiple (std::vector<std::unique_ptr<Pattern>> patterns)
: patterns (std::move (patterns))
{}
@@ -1073,8 +1072,8 @@ public:
return TuplePatternItemType::MULTIPLE;
}
- std::vector<std::unique_ptr<Pattern> > &get_patterns () { return patterns; }
- const std::vector<std::unique_ptr<Pattern> > &get_patterns () const
+ std::vector<std::unique_ptr<Pattern>> &get_patterns () { return patterns; }
+ const std::vector<std::unique_ptr<Pattern>> &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<std::unique_ptr<Pattern> > lower_patterns;
- std::vector<std::unique_ptr<Pattern> > upper_patterns;
+ std::vector<std::unique_ptr<Pattern>> lower_patterns;
+ std::vector<std::unique_ptr<Pattern>> upper_patterns;
public:
- TuplePatternItemsRanged (
- std::vector<std::unique_ptr<Pattern> > lower_patterns,
- std::vector<std::unique_ptr<Pattern> > upper_patterns)
+ TuplePatternItemsRanged (std::vector<std::unique_ptr<Pattern>> lower_patterns,
+ std::vector<std::unique_ptr<Pattern>> upper_patterns)
: lower_patterns (std::move (lower_patterns)),
upper_patterns (std::move (upper_patterns))
{}
@@ -1142,20 +1140,20 @@ public:
return TuplePatternItemType::RANGED;
}
- std::vector<std::unique_ptr<Pattern> > &get_lower_patterns ()
+ std::vector<std::unique_ptr<Pattern>> &get_lower_patterns ()
{
return lower_patterns;
}
- const std::vector<std::unique_ptr<Pattern> > &get_lower_patterns () const
+ const std::vector<std::unique_ptr<Pattern>> &get_lower_patterns () const
{
return lower_patterns;
}
- std::vector<std::unique_ptr<Pattern> > &get_upper_patterns ()
+ std::vector<std::unique_ptr<Pattern>> &get_upper_patterns ()
{
return upper_patterns;
}
- const std::vector<std::unique_ptr<Pattern> > &get_upper_patterns () const
+ const std::vector<std::unique_ptr<Pattern>> &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<std::unique_ptr<Pattern> > items;
+ std::vector<std::unique_ptr<Pattern>> items;
Location locus;
Analysis::NodeMapping mappings;
@@ -1241,7 +1239,7 @@ public:
std::string as_string () const override;
SlicePattern (Analysis::NodeMapping mappings,
- std::vector<std::unique_ptr<Pattern> > items, Location locus)
+ std::vector<std::unique_ptr<Pattern>> items, Location locus)
: items (std::move (items)), locus (locus), mappings (mappings)
{}
More information about the Gcc-cvs
mailing list