Skip to content

Commit beb83b4

Browse files
eureka-cpueureka-cpu
authored
Changes .clone().into_inner() to .get() in sfv2 (#2504)
change .clone().into_inner() to .get()
1 parent 6d18807 commit beb83b4

File tree

15 files changed

+44
-100
lines changed

15 files changed

+44
-100
lines changed

‎sway-fmt-v2/src/items/item_enum.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ impl Format for ItemEnum {
3838
generics.format(formatted_code, formatter)?;
3939
}
4040

41-
let fields = self.fields.clone().into_inner();
41+
let fields = self.fields.get();
4242

4343
// Handle openning brace
4444
ItemEnum::open_curly_brace(formatted_code, formatter)?;
4545
// Determine alignment tactic
4646
match formatter.config.structures.field_alignment {
4747
FieldAlignment::AlignFields(enum_variant_align_threshold) => {
4848
writeln!(formatted_code)?;
49-
let value_pairs = fields.value_separator_pairs;
49+
let value_pairs = &fields.value_separator_pairs;
5050
// In first iteration we are going to be collecting the lengths of the enum variants.
5151
let variant_length: Vec<usize> = value_pairs
5252
.iter()

‎sway-fmt-v2/src/items/item_fn.rs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ impl Format for ItemFn {
1919
) -> Result<(), FormatterError> {
2020
self.fn_signature.format(formatted_code, formatter)?;
2121
Self::open_curly_brace(formatted_code, formatter)?;
22-
self.body
23-
.clone()
24-
.into_inner()
25-
.format(formatted_code, formatter)?;
22+
self.body.get().format(formatted_code, formatter)?;
2623
Self::close_curly_brace(formatted_code, formatter)?;
2724

2825
Ok(())
@@ -96,13 +93,13 @@ impl Format for FnSignature {
9693
self.name.as_str()
9794
)?;
9895
// `<T>`
99-
if let Some(generics) = &self.generics.clone() {
96+
if let Some(generics) = &self.generics {
10097
generics.format(formatted_code, formatter)?;
10198
}
10299
// `(`
103100
Self::open_parenthesis(formatted_code, formatter)?;
104101
// FnArgs
105-
match self.arguments.clone().into_inner() {
102+
match self.arguments.get() {
106103
FnArgs::Static(args) => {
107104
args.format(formatted_code, formatter)?;
108105
}

‎sway-fmt-v2/src/items/item_impl.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl Format for ItemImpl {
3838
formatter.shape.update_where_clause();
3939
}
4040
Self::open_curly_brace(formatted_code, formatter)?;
41-
let contents = self.contents.clone().into_inner();
41+
let contents = self.contents.get();
4242
for item in contents.iter() {
4343
item.format(formatted_code, formatter)?;
4444
}

‎sway-fmt-v2/src/items/item_storage.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ impl Format for ItemStorage {
2525
.update_line_style(LineStyle::Multiline);
2626
// Add storage token
2727
write!(formatted_code, "{}", self.storage_token.span().as_str())?;
28-
let fields = self.fields.clone().into_inner();
28+
let fields = self.fields.get();
2929

3030
// Handle openning brace
3131
Self::open_curly_brace(formatted_code, formatter)?;
@@ -34,7 +34,7 @@ impl Format for ItemStorage {
3434
match formatter.config.structures.field_alignment {
3535
FieldAlignment::AlignFields(storage_field_align_threshold) => {
3636
writeln!(formatted_code)?;
37-
let value_pairs = fields.value_separator_pairs;
37+
let value_pairs = &fields.value_separator_pairs;
3838
// In first iteration we are going to be collecting the lengths of the struct fields.
3939
let field_length: Vec<usize> = value_pairs
4040
.iter()

‎sway-fmt-v2/src/items/item_struct.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ impl Format for ItemStruct {
3838
generics.format(formatted_code, formatter)?;
3939
}
4040

41-
let fields = self.fields.clone().into_inner();
41+
let fields = self.fields.get();
4242

4343
// Handle openning brace
4444
Self::open_curly_brace(formatted_code, formatter)?;
4545
// Determine alignment tactic
4646
match formatter.config.structures.field_alignment {
4747
FieldAlignment::AlignFields(enum_variant_align_threshold) => {
4848
writeln!(formatted_code)?;
49-
let value_pairs = fields.value_separator_pairs;
49+
let value_pairs = &fields.value_separator_pairs;
5050
// In first iteration we are going to be collecting the lengths of the struct variants.
5151
let variant_length: Vec<usize> = value_pairs
5252
.iter()

‎sway-fmt-v2/src/items/item_trait.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ impl Format for ItemTrait {
3434
}
3535
write!(formatted_code, " ")?;
3636
Self::open_curly_brace(formatted_code, formatter)?;
37-
for (fn_signature, semicolon_token) in self.trait_items.clone().into_inner() {
37+
for (fn_signature, semicolon_token) in self.trait_items.get() {
3838
// format `Annotated<FnSignature>`
3939
fn_signature.format(formatted_code, formatter)?;
4040
writeln!(formatted_code, "{}\n", semicolon_token.ident().as_str())?;
4141
}
4242
formatted_code.pop(); // pop last ending newline
4343
if let Some(trait_defs) = &self.trait_defs_opt {
4444
Self::open_curly_brace(formatted_code, formatter)?;
45-
for trait_items in trait_defs.clone().into_inner() {
45+
for trait_items in trait_defs.get() {
4646
write!(
4747
formatted_code,
4848
"{}",

‎sway-fmt-v2/src/utils/attribute.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ impl FormatDecl for AttributeDecl {
5454
write!(line, "{}", self.hash_token.span().as_str())?;
5555
// `[`
5656
Self::open_square_bracket(line, formatter)?;
57-
let attr = self.attribute.clone().into_inner();
57+
let attr = self.attribute.get();
5858
// name e.g. `storage`
5959
write!(line, "{}", attr.name.span().as_str())?;
6060
// `(`
6161
Self::open_parenthesis(line, formatter)?;
6262
// format and add args e.g. `read, write`
63-
if let Some(args) = attr.args {
64-
args.into_inner().format(line, formatter)?;
63+
if let Some(args) = &attr.args {
64+
args.get().format(line, formatter)?;
6565
}
6666
// ')'
6767
Self::close_parenthesis(line, formatter)?;

‎sway-fmt-v2/src/utils/comments.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ where
115115
// Add opening brace's ByteSpan
116116
collected_spans.push(opening_brace_span);
117117
// Add T's collected ByteSpan
118-
collected_spans.append(&mut self.clone().into_inner().leaf_spans());
118+
collected_spans.append(&mut self.get().leaf_spans());
119119
let mut closing_brace_span = ByteSpan::from(self.span());
120120
closing_brace_span.start = closing_brace_span.end - 1;
121121
// Add closing brace's ByteSpan
@@ -135,7 +135,7 @@ where
135135
// Add opening paren's span
136136
collected_spans.push(opening_paren_span);
137137
// Add T's collected ByteSpan
138-
collected_spans.append(&mut self.clone().into_inner().leaf_spans());
138+
collected_spans.append(&mut self.get().leaf_spans());
139139
let mut closing_paren_span = ByteSpan::from(self.span());
140140
closing_paren_span.start = closing_paren_span.end - 1;
141141
// Add closing paren's ByteSpan
@@ -155,7 +155,7 @@ where
155155
// Add opening bracket's span
156156
collected_spans.push(opening_bracket_span);
157157
// Add T's collected ByteSpan
158-
collected_spans.append(&mut self.clone().into_inner().leaf_spans());
158+
collected_spans.append(&mut self.get().leaf_spans());
159159
let mut closing_bracket_span = ByteSpan::from(self.span());
160160
closing_bracket_span.start = closing_bracket_span.end - 1;
161161
// Add closing bracket's ByteSpan

‎sway-fmt-v2/src/utils/expr/asm_block.rs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,10 @@ impl Format for AsmBlock {
2121
) -> Result<(), FormatterError> {
2222
write!(formatted_code, "{} ", self.asm_token.span().as_str())?;
2323
Self::open_parenthesis(formatted_code, formatter)?;
24-
self.registers
25-
.clone()
26-
.into_inner()
27-
.format(formatted_code, formatter)?;
24+
self.registers.get().format(formatted_code, formatter)?;
2825
Self::close_parenthesis(formatted_code, formatter)?;
2926
Self::open_square_bracket(formatted_code, formatter)?;
30-
self.contents
31-
.clone()
32-
.into_inner()
33-
.format(formatted_code, formatter)?;
27+
self.contents.get().format(formatted_code, formatter)?;
3428
Self::close_square_bracket(formatted_code, formatter)?;
3529

3630
Ok(())

‎sway-fmt-v2/src/utils/expr/assignable.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ impl Format for Assignable {
2727
Assignable::Index { target, arg } => {
2828
target.format(formatted_code, formatter)?;
2929
Expr::open_square_bracket(formatted_code, formatter)?;
30-
arg.clone().into_inner().format(formatted_code, formatter)?;
30+
arg.get().format(formatted_code, formatter)?;
3131
Expr::close_square_bracket(formatted_code, formatter)?;
3232
}
3333
Assignable::FieldProjection {

0 commit comments

Comments
 (0)