Skip to content

Commit 0e75f57

Browse files
committed
style: apply clippy suggestions for use_self
Replace NodeType:: with Self:: in match patterns to follow Rust idioms and reduce unnecessary structure name repetition. No functional changes - purely cosmetic improvements.
1 parent d25d7fb commit 0e75f57

File tree

1 file changed

+136
-136
lines changed

1 file changed

+136
-136
lines changed

crates/artifacts/solc/src/ast/lowfidelity.rs

Lines changed: 136 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -213,80 +213,80 @@ impl serde::Serialize for NodeType {
213213
S: serde::Serializer,
214214
{
215215
match self {
216-
NodeType::Assignment => serializer.serialize_str("Assignment"),
217-
NodeType::BinaryOperation => serializer.serialize_str("BinaryOperation"),
218-
NodeType::Conditional => serializer.serialize_str("Conditional"),
219-
NodeType::ElementaryTypeNameExpression => {
216+
Self::Assignment => serializer.serialize_str("Assignment"),
217+
Self::BinaryOperation => serializer.serialize_str("BinaryOperation"),
218+
Self::Conditional => serializer.serialize_str("Conditional"),
219+
Self::ElementaryTypeNameExpression => {
220220
serializer.serialize_str("ElementaryTypeNameExpression")
221221
}
222-
NodeType::FunctionCall => serializer.serialize_str("FunctionCall"),
223-
NodeType::FunctionCallOptions => serializer.serialize_str("FunctionCallOptions"),
224-
NodeType::Identifier => serializer.serialize_str("Identifier"),
225-
NodeType::IndexAccess => serializer.serialize_str("IndexAccess"),
226-
NodeType::IndexRangeAccess => serializer.serialize_str("IndexRangeAccess"),
227-
NodeType::Literal => serializer.serialize_str("Literal"),
228-
NodeType::MemberAccess => serializer.serialize_str("MemberAccess"),
229-
NodeType::NewExpression => serializer.serialize_str("NewExpression"),
230-
NodeType::TupleExpression => serializer.serialize_str("TupleExpression"),
231-
NodeType::UnaryOperation => serializer.serialize_str("UnaryOperation"),
232-
NodeType::Block => serializer.serialize_str("Block"),
233-
NodeType::Break => serializer.serialize_str("Break"),
234-
NodeType::Continue => serializer.serialize_str("Continue"),
235-
NodeType::DoWhileStatement => serializer.serialize_str("DoWhileStatement"),
236-
NodeType::EmitStatement => serializer.serialize_str("EmitStatement"),
237-
NodeType::ExpressionStatement => serializer.serialize_str("ExpressionStatement"),
238-
NodeType::ForStatement => serializer.serialize_str("ForStatement"),
239-
NodeType::IfStatement => serializer.serialize_str("IfStatement"),
240-
NodeType::InlineAssembly => serializer.serialize_str("InlineAssembly"),
241-
NodeType::PlaceholderStatement => serializer.serialize_str("PlaceholderStatement"),
242-
NodeType::Return => serializer.serialize_str("Return"),
243-
NodeType::RevertStatement => serializer.serialize_str("RevertStatement"),
244-
NodeType::TryStatement => serializer.serialize_str("TryStatement"),
245-
NodeType::UncheckedBlock => serializer.serialize_str("UncheckedBlock"),
246-
NodeType::VariableDeclarationStatement => {
222+
Self::FunctionCall => serializer.serialize_str("FunctionCall"),
223+
Self::FunctionCallOptions => serializer.serialize_str("FunctionCallOptions"),
224+
Self::Identifier => serializer.serialize_str("Identifier"),
225+
Self::IndexAccess => serializer.serialize_str("IndexAccess"),
226+
Self::IndexRangeAccess => serializer.serialize_str("IndexRangeAccess"),
227+
Self::Literal => serializer.serialize_str("Literal"),
228+
Self::MemberAccess => serializer.serialize_str("MemberAccess"),
229+
Self::NewExpression => serializer.serialize_str("NewExpression"),
230+
Self::TupleExpression => serializer.serialize_str("TupleExpression"),
231+
Self::UnaryOperation => serializer.serialize_str("UnaryOperation"),
232+
Self::Block => serializer.serialize_str("Block"),
233+
Self::Break => serializer.serialize_str("Break"),
234+
Self::Continue => serializer.serialize_str("Continue"),
235+
Self::DoWhileStatement => serializer.serialize_str("DoWhileStatement"),
236+
Self::EmitStatement => serializer.serialize_str("EmitStatement"),
237+
Self::ExpressionStatement => serializer.serialize_str("ExpressionStatement"),
238+
Self::ForStatement => serializer.serialize_str("ForStatement"),
239+
Self::IfStatement => serializer.serialize_str("IfStatement"),
240+
Self::InlineAssembly => serializer.serialize_str("InlineAssembly"),
241+
Self::PlaceholderStatement => serializer.serialize_str("PlaceholderStatement"),
242+
Self::Return => serializer.serialize_str("Return"),
243+
Self::RevertStatement => serializer.serialize_str("RevertStatement"),
244+
Self::TryStatement => serializer.serialize_str("TryStatement"),
245+
Self::UncheckedBlock => serializer.serialize_str("UncheckedBlock"),
246+
Self::VariableDeclarationStatement => {
247247
serializer.serialize_str("VariableDeclarationStatement")
248248
}
249-
NodeType::VariableDeclaration => serializer.serialize_str("VariableDeclaration"),
250-
NodeType::WhileStatement => serializer.serialize_str("WhileStatement"),
251-
NodeType::YulAssignment => serializer.serialize_str("YulAssignment"),
252-
NodeType::YulBlock => serializer.serialize_str("YulBlock"),
253-
NodeType::YulBreak => serializer.serialize_str("YulBreak"),
254-
NodeType::YulCase => serializer.serialize_str("YulCase"),
255-
NodeType::YulContinue => serializer.serialize_str("YulContinue"),
256-
NodeType::YulExpressionStatement => serializer.serialize_str("YulExpressionStatement"),
257-
NodeType::YulLeave => serializer.serialize_str("YulLeave"),
258-
NodeType::YulForLoop => serializer.serialize_str("YulForLoop"),
259-
NodeType::YulFunctionDefinition => serializer.serialize_str("YulFunctionDefinition"),
260-
NodeType::YulIf => serializer.serialize_str("YulIf"),
261-
NodeType::YulSwitch => serializer.serialize_str("YulSwitch"),
262-
NodeType::YulVariableDeclaration => serializer.serialize_str("YulVariableDeclaration"),
263-
NodeType::YulFunctionCall => serializer.serialize_str("YulFunctionCall"),
264-
NodeType::YulIdentifier => serializer.serialize_str("YulIdentifier"),
265-
NodeType::YulLiteral => serializer.serialize_str("YulLiteral"),
266-
NodeType::YulLiteralValue => serializer.serialize_str("YulLiteralValue"),
267-
NodeType::YulHexValue => serializer.serialize_str("YulHexValue"),
268-
NodeType::YulTypedName => serializer.serialize_str("YulTypedName"),
269-
NodeType::ContractDefinition => serializer.serialize_str("ContractDefinition"),
270-
NodeType::FunctionDefinition => serializer.serialize_str("FunctionDefinition"),
271-
NodeType::EventDefinition => serializer.serialize_str("EventDefinition"),
272-
NodeType::ErrorDefinition => serializer.serialize_str("ErrorDefinition"),
273-
NodeType::ModifierDefinition => serializer.serialize_str("ModifierDefinition"),
274-
NodeType::StructDefinition => serializer.serialize_str("StructDefinition"),
275-
NodeType::EnumDefinition => serializer.serialize_str("EnumDefinition"),
276-
NodeType::UserDefinedValueTypeDefinition => {
249+
Self::VariableDeclaration => serializer.serialize_str("VariableDeclaration"),
250+
Self::WhileStatement => serializer.serialize_str("WhileStatement"),
251+
Self::YulAssignment => serializer.serialize_str("YulAssignment"),
252+
Self::YulBlock => serializer.serialize_str("YulBlock"),
253+
Self::YulBreak => serializer.serialize_str("YulBreak"),
254+
Self::YulCase => serializer.serialize_str("YulCase"),
255+
Self::YulContinue => serializer.serialize_str("YulContinue"),
256+
Self::YulExpressionStatement => serializer.serialize_str("YulExpressionStatement"),
257+
Self::YulLeave => serializer.serialize_str("YulLeave"),
258+
Self::YulForLoop => serializer.serialize_str("YulForLoop"),
259+
Self::YulFunctionDefinition => serializer.serialize_str("YulFunctionDefinition"),
260+
Self::YulIf => serializer.serialize_str("YulIf"),
261+
Self::YulSwitch => serializer.serialize_str("YulSwitch"),
262+
Self::YulVariableDeclaration => serializer.serialize_str("YulVariableDeclaration"),
263+
Self::YulFunctionCall => serializer.serialize_str("YulFunctionCall"),
264+
Self::YulIdentifier => serializer.serialize_str("YulIdentifier"),
265+
Self::YulLiteral => serializer.serialize_str("YulLiteral"),
266+
Self::YulLiteralValue => serializer.serialize_str("YulLiteralValue"),
267+
Self::YulHexValue => serializer.serialize_str("YulHexValue"),
268+
Self::YulTypedName => serializer.serialize_str("YulTypedName"),
269+
Self::ContractDefinition => serializer.serialize_str("ContractDefinition"),
270+
Self::FunctionDefinition => serializer.serialize_str("FunctionDefinition"),
271+
Self::EventDefinition => serializer.serialize_str("EventDefinition"),
272+
Self::ErrorDefinition => serializer.serialize_str("ErrorDefinition"),
273+
Self::ModifierDefinition => serializer.serialize_str("ModifierDefinition"),
274+
Self::StructDefinition => serializer.serialize_str("StructDefinition"),
275+
Self::EnumDefinition => serializer.serialize_str("EnumDefinition"),
276+
Self::UserDefinedValueTypeDefinition => {
277277
serializer.serialize_str("UserDefinedValueTypeDefinition")
278278
}
279-
NodeType::PragmaDirective => serializer.serialize_str("PragmaDirective"),
280-
NodeType::ImportDirective => serializer.serialize_str("ImportDirective"),
281-
NodeType::UsingForDirective => serializer.serialize_str("UsingForDirective"),
282-
NodeType::SourceUnit => serializer.serialize_str("SourceUnit"),
283-
NodeType::InheritanceSpecifier => serializer.serialize_str("InheritanceSpecifier"),
284-
NodeType::ElementaryTypeName => serializer.serialize_str("ElementaryTypeName"),
285-
NodeType::FunctionTypeName => serializer.serialize_str("FunctionTypeName"),
286-
NodeType::ParameterList => serializer.serialize_str("ParameterList"),
287-
NodeType::TryCatchClause => serializer.serialize_str("TryCatchClause"),
288-
NodeType::ModifierInvocation => serializer.serialize_str("ModifierInvocation"),
289-
NodeType::Other(s) => serializer.serialize_str(s),
279+
Self::PragmaDirective => serializer.serialize_str("PragmaDirective"),
280+
Self::ImportDirective => serializer.serialize_str("ImportDirective"),
281+
Self::UsingForDirective => serializer.serialize_str("UsingForDirective"),
282+
Self::SourceUnit => serializer.serialize_str("SourceUnit"),
283+
Self::InheritanceSpecifier => serializer.serialize_str("InheritanceSpecifier"),
284+
Self::ElementaryTypeName => serializer.serialize_str("ElementaryTypeName"),
285+
Self::FunctionTypeName => serializer.serialize_str("FunctionTypeName"),
286+
Self::ParameterList => serializer.serialize_str("ParameterList"),
287+
Self::TryCatchClause => serializer.serialize_str("TryCatchClause"),
288+
Self::ModifierInvocation => serializer.serialize_str("ModifierInvocation"),
289+
Self::Other(s) => serializer.serialize_str(s),
290290
}
291291
}
292292
}
@@ -298,74 +298,74 @@ impl<'de> serde::Deserialize<'de> for NodeType {
298298
{
299299
let s = String::deserialize(deserializer)?;
300300
Ok(match s.as_str() {
301-
"Assignment" => NodeType::Assignment,
302-
"BinaryOperation" => NodeType::BinaryOperation,
303-
"Conditional" => NodeType::Conditional,
304-
"ElementaryTypeNameExpression" => NodeType::ElementaryTypeNameExpression,
305-
"FunctionCall" => NodeType::FunctionCall,
306-
"FunctionCallOptions" => NodeType::FunctionCallOptions,
307-
"Identifier" => NodeType::Identifier,
308-
"IndexAccess" => NodeType::IndexAccess,
309-
"IndexRangeAccess" => NodeType::IndexRangeAccess,
310-
"Literal" => NodeType::Literal,
311-
"MemberAccess" => NodeType::MemberAccess,
312-
"NewExpression" => NodeType::NewExpression,
313-
"TupleExpression" => NodeType::TupleExpression,
314-
"UnaryOperation" => NodeType::UnaryOperation,
315-
"Block" => NodeType::Block,
316-
"Break" => NodeType::Break,
317-
"Continue" => NodeType::Continue,
318-
"DoWhileStatement" => NodeType::DoWhileStatement,
319-
"EmitStatement" => NodeType::EmitStatement,
320-
"ExpressionStatement" => NodeType::ExpressionStatement,
321-
"ForStatement" => NodeType::ForStatement,
322-
"IfStatement" => NodeType::IfStatement,
323-
"InlineAssembly" => NodeType::InlineAssembly,
324-
"PlaceholderStatement" => NodeType::PlaceholderStatement,
325-
"Return" => NodeType::Return,
326-
"RevertStatement" => NodeType::RevertStatement,
327-
"TryStatement" => NodeType::TryStatement,
328-
"UncheckedBlock" => NodeType::UncheckedBlock,
329-
"VariableDeclarationStatement" => NodeType::VariableDeclarationStatement,
330-
"VariableDeclaration" => NodeType::VariableDeclaration,
331-
"WhileStatement" => NodeType::WhileStatement,
332-
"YulAssignment" => NodeType::YulAssignment,
333-
"YulBlock" => NodeType::YulBlock,
334-
"YulBreak" => NodeType::YulBreak,
335-
"YulCase" => NodeType::YulCase,
336-
"YulContinue" => NodeType::YulContinue,
337-
"YulExpressionStatement" => NodeType::YulExpressionStatement,
338-
"YulLeave" => NodeType::YulLeave,
339-
"YulForLoop" => NodeType::YulForLoop,
340-
"YulFunctionDefinition" => NodeType::YulFunctionDefinition,
341-
"YulIf" => NodeType::YulIf,
342-
"YulSwitch" => NodeType::YulSwitch,
343-
"YulVariableDeclaration" => NodeType::YulVariableDeclaration,
344-
"YulFunctionCall" => NodeType::YulFunctionCall,
345-
"YulIdentifier" => NodeType::YulIdentifier,
346-
"YulLiteral" => NodeType::YulLiteral,
347-
"YulLiteralValue" => NodeType::YulLiteralValue,
348-
"YulHexValue" => NodeType::YulHexValue,
349-
"YulTypedName" => NodeType::YulTypedName,
350-
"ContractDefinition" => NodeType::ContractDefinition,
351-
"FunctionDefinition" => NodeType::FunctionDefinition,
352-
"EventDefinition" => NodeType::EventDefinition,
353-
"ErrorDefinition" => NodeType::ErrorDefinition,
354-
"ModifierDefinition" => NodeType::ModifierDefinition,
355-
"StructDefinition" => NodeType::StructDefinition,
356-
"EnumDefinition" => NodeType::EnumDefinition,
357-
"UserDefinedValueTypeDefinition" => NodeType::UserDefinedValueTypeDefinition,
358-
"PragmaDirective" => NodeType::PragmaDirective,
359-
"ImportDirective" => NodeType::ImportDirective,
360-
"UsingForDirective" => NodeType::UsingForDirective,
361-
"SourceUnit" => NodeType::SourceUnit,
362-
"InheritanceSpecifier" => NodeType::InheritanceSpecifier,
363-
"ElementaryTypeName" => NodeType::ElementaryTypeName,
364-
"FunctionTypeName" => NodeType::FunctionTypeName,
365-
"ParameterList" => NodeType::ParameterList,
366-
"TryCatchClause" => NodeType::TryCatchClause,
367-
"ModifierInvocation" => NodeType::ModifierInvocation,
368-
_ => NodeType::Other(s),
301+
"Assignment" => Self::Assignment,
302+
"BinaryOperation" => Self::BinaryOperation,
303+
"Conditional" => Self::Conditional,
304+
"ElementaryTypeNameExpression" => Self::ElementaryTypeNameExpression,
305+
"FunctionCall" => Self::FunctionCall,
306+
"FunctionCallOptions" => Self::FunctionCallOptions,
307+
"Identifier" => Self::Identifier,
308+
"IndexAccess" => Self::IndexAccess,
309+
"IndexRangeAccess" => Self::IndexRangeAccess,
310+
"Literal" => Self::Literal,
311+
"MemberAccess" => Self::MemberAccess,
312+
"NewExpression" => Self::NewExpression,
313+
"TupleExpression" => Self::TupleExpression,
314+
"UnaryOperation" => Self::UnaryOperation,
315+
"Block" => Self::Block,
316+
"Break" => Self::Break,
317+
"Continue" => Self::Continue,
318+
"DoWhileStatement" => Self::DoWhileStatement,
319+
"EmitStatement" => Self::EmitStatement,
320+
"ExpressionStatement" => Self::ExpressionStatement,
321+
"ForStatement" => Self::ForStatement,
322+
"IfStatement" => Self::IfStatement,
323+
"InlineAssembly" => Self::InlineAssembly,
324+
"PlaceholderStatement" => Self::PlaceholderStatement,
325+
"Return" => Self::Return,
326+
"RevertStatement" => Self::RevertStatement,
327+
"TryStatement" => Self::TryStatement,
328+
"UncheckedBlock" => Self::UncheckedBlock,
329+
"VariableDeclarationStatement" => Self::VariableDeclarationStatement,
330+
"VariableDeclaration" => Self::VariableDeclaration,
331+
"WhileStatement" => Self::WhileStatement,
332+
"YulAssignment" => Self::YulAssignment,
333+
"YulBlock" => Self::YulBlock,
334+
"YulBreak" => Self::YulBreak,
335+
"YulCase" => Self::YulCase,
336+
"YulContinue" => Self::YulContinue,
337+
"YulExpressionStatement" => Self::YulExpressionStatement,
338+
"YulLeave" => Self::YulLeave,
339+
"YulForLoop" => Self::YulForLoop,
340+
"YulFunctionDefinition" => Self::YulFunctionDefinition,
341+
"YulIf" => Self::YulIf,
342+
"YulSwitch" => Self::YulSwitch,
343+
"YulVariableDeclaration" => Self::YulVariableDeclaration,
344+
"YulFunctionCall" => Self::YulFunctionCall,
345+
"YulIdentifier" => Self::YulIdentifier,
346+
"YulLiteral" => Self::YulLiteral,
347+
"YulLiteralValue" => Self::YulLiteralValue,
348+
"YulHexValue" => Self::YulHexValue,
349+
"YulTypedName" => Self::YulTypedName,
350+
"ContractDefinition" => Self::ContractDefinition,
351+
"FunctionDefinition" => Self::FunctionDefinition,
352+
"EventDefinition" => Self::EventDefinition,
353+
"ErrorDefinition" => Self::ErrorDefinition,
354+
"ModifierDefinition" => Self::ModifierDefinition,
355+
"StructDefinition" => Self::StructDefinition,
356+
"EnumDefinition" => Self::EnumDefinition,
357+
"UserDefinedValueTypeDefinition" => Self::UserDefinedValueTypeDefinition,
358+
"PragmaDirective" => Self::PragmaDirective,
359+
"ImportDirective" => Self::ImportDirective,
360+
"UsingForDirective" => Self::UsingForDirective,
361+
"SourceUnit" => Self::SourceUnit,
362+
"InheritanceSpecifier" => Self::InheritanceSpecifier,
363+
"ElementaryTypeName" => Self::ElementaryTypeName,
364+
"FunctionTypeName" => Self::FunctionTypeName,
365+
"ParameterList" => Self::ParameterList,
366+
"TryCatchClause" => Self::TryCatchClause,
367+
"ModifierInvocation" => Self::ModifierInvocation,
368+
_ => Self::Other(s),
369369
})
370370
}
371371
}

0 commit comments

Comments
 (0)