From 19b0a49967a02f65d20e7af70ac79ddfd7292dfd Mon Sep 17 00:00:00 2001 From: Joe Savona Date: Fri, 14 Jul 2023 15:33:06 +0900 Subject: [PATCH] [rust] add+apply rustfmt config --- .../crates/forget_build_hir/src/build.rs | 11 +- .../crates/forget_build_hir/src/builder.rs | 12 +- .../forget_diagnostics/src/diagnostic.rs | 6 +- .../crates/forget_diagnostics/src/lib.rs | 6 +- .../crates/forget_estree/src/generated.rs | 1896 ++++++++--------- .../crates/forget_estree/src/js_value.rs | 16 +- .../forget/crates/forget_estree/src/lib.rs | 3 +- .../forget/crates/forget_estree/src/range.rs | 11 +- .../forget_estree_codegen/src/codegen.rs | 3 +- .../crates/forget_estree_swc/src/lib.rs | 33 +- .../forget_fixtures/tests/fixtures_test.rs | 3 +- .../crates/forget_hir/src/basic_block.rs | 3 +- .../crates/forget_hir/src/environment.rs | 12 +- .../forget/crates/forget_hir/src/function.rs | 6 +- .../crates/forget_hir/src/instruction.rs | 10 +- .../forget/crates/forget_hir/src/terminal.rs | 3 +- .../forget/crates/forget_ssa/src/enter.rs | 8 +- compiler/forget/rustfmt.toml | 8 + 18 files changed, 939 insertions(+), 1111 deletions(-) create mode 100644 compiler/forget/rustfmt.toml diff --git a/compiler/forget/crates/forget_build_hir/src/build.rs b/compiler/forget/crates/forget_build_hir/src/build.rs index 727a61dca9..37ef55ee73 100644 --- a/compiler/forget/crates/forget_build_hir/src/build.rs +++ b/compiler/forget/crates/forget_build_hir/src/build.rs @@ -1,6 +1,7 @@ use std::collections::HashSet; -use bumpalo::{boxed::Box, collections::String}; +use bumpalo::boxed::Box; +use bumpalo::collections::String; use forget_diagnostics::{Diagnostic, DiagnosticSeverity}; use forget_estree::{ AssignmentTarget, BinaryExpression, BlockStatement, Expression, ForInit, ForStatement, @@ -13,11 +14,9 @@ use forget_hir::{ PrimitiveValue, TerminalValue, }; -use crate::{ - builder::{Binding, Builder, LoopScope}, - context::get_context_identifiers, - error::BuildHIRError, -}; +use crate::builder::{Binding, Builder, LoopScope}; +use crate::context::get_context_identifiers; +use crate::error::BuildHIRError; /// Converts a React function in ESTree format into HIR. Returns the HIR /// if it was constructed sucessfully, otherwise a list of diagnostics diff --git a/compiler/forget/crates/forget_build_hir/src/builder.rs b/compiler/forget/crates/forget_build_hir/src/builder.rs index d0c764ddfc..7b13ac40f3 100644 --- a/compiler/forget/crates/forget_build_hir/src/builder.rs +++ b/compiler/forget/crates/forget_build_hir/src/builder.rs @@ -1,10 +1,10 @@ -use bumpalo::{ - boxed::Box, - collections::{String, Vec}, -}; -use forget_diagnostics::{invariant, Diagnostic, DiagnosticSeverity}; -use std::{cell::RefCell, collections::HashSet, rc::Rc}; +use std::cell::RefCell; +use std::collections::HashSet; +use std::rc::Rc; +use bumpalo::boxed::Box; +use bumpalo::collections::{String, Vec}; +use forget_diagnostics::{invariant, Diagnostic, DiagnosticSeverity}; use forget_hir::{ BasicBlock, BlockId, BlockKind, Environment, GotoKind, Identifier, IdentifierData, InstrIx, Instruction, InstructionIdGenerator, InstructionValue, Terminal, TerminalValue, Type, HIR, diff --git a/compiler/forget/crates/forget_diagnostics/src/diagnostic.rs b/compiler/forget/crates/forget_diagnostics/src/diagnostic.rs index b063617279..68c8ee679b 100644 --- a/compiler/forget/crates/forget_diagnostics/src/diagnostic.rs +++ b/compiler/forget/crates/forget_diagnostics/src/diagnostic.rs @@ -1,7 +1,5 @@ -use std::{ - error::Error, - fmt::{Debug, Display, Write}, -}; +use std::error::Error; +use std::fmt::{Debug, Display, Write}; use forget_estree::SourceRange; use miette::{ByteOffset, SourceSpan}; diff --git a/compiler/forget/crates/forget_diagnostics/src/lib.rs b/compiler/forget/crates/forget_diagnostics/src/lib.rs index 06cacb05aa..2c86957936 100644 --- a/compiler/forget/crates/forget_diagnostics/src/lib.rs +++ b/compiler/forget/crates/forget_diagnostics/src/lib.rs @@ -8,9 +8,5 @@ pub fn invariant(cond: bool, f: F) -> Result<(), Diagnostic> where F: Fn() -> Diagnostic, { - if cond { - Ok(()) - } else { - Err(f()) - } + if cond { Ok(()) } else { Err(f()) } } diff --git a/compiler/forget/crates/forget_estree/src/generated.rs b/compiler/forget/crates/forget_estree/src/generated.rs index 474a658936..1e8661b41c 100644 --- a/compiler/forget/crates/forget_estree/src/generated.rs +++ b/compiler/forget/crates/forget_estree/src/generated.rs @@ -1,6 +1,8 @@ use std::num::NonZeroU32; -use serde::{Serialize, Deserialize}; -use crate::{JsValue, Binding, SourceRange}; + +use serde::{Deserialize, Serialize}; + +use crate::{Binding, JsValue, SourceRange}; #[derive(Serialize, Deserialize, Clone, Debug)] pub struct SourceLocation { pub source: Option, @@ -667,167 +669,134 @@ impl<'de> serde::Deserialize<'de> for Statement { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __StatementTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__StatementTag>::new("type", "Pattern"), )?; match tagged.0 { __StatementTag::BlockStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Statement::BlockStatement(node)) } __StatementTag::BreakStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Statement::BreakStatement(node)) } __StatementTag::ContinueStatement => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Statement::ContinueStatement(node)) } __StatementTag::DebuggerStatement => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Statement::DebuggerStatement(node)) } __StatementTag::DoWhileStatement => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Statement::DoWhileStatement(node)) } __StatementTag::EmptyStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Statement::EmptyStatement(node)) } __StatementTag::ExpressionStatement => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Statement::ExpressionStatement(node)) } __StatementTag::ForInStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Statement::ForInStatement(node)) } __StatementTag::ForOfStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Statement::ForOfStatement(node)) } __StatementTag::ForStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Statement::ForStatement(node)) } __StatementTag::FunctionDeclaration => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Statement::FunctionDeclaration(node)) } __StatementTag::IfStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Statement::IfStatement(node)) } __StatementTag::LabeledStatement => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Statement::LabeledStatement(node)) } __StatementTag::ReturnStatement => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Statement::ReturnStatement(node)) } __StatementTag::SwitchStatement => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Statement::SwitchStatement(node)) } __StatementTag::ThrowStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Statement::ThrowStatement(node)) } __StatementTag::TryStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Statement::TryStatement(node)) } __StatementTag::VariableDeclaration => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Statement::VariableDeclaration(node)) } __StatementTag::WhileStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Statement::WhileStatement(node)) } __StatementTag::WithStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Statement::WithStatement(node)) @@ -887,159 +856,132 @@ impl<'de> serde::Deserialize<'de> for Expression { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __ExpressionTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__ExpressionTag>::new("type", "Pattern"), )?; match tagged.0 { __ExpressionTag::ArrayExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Expression::ArrayExpression(node)) } __ExpressionTag::ArrowFunctionExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Expression::ArrowFunctionExpression(node)) } __ExpressionTag::AssignmentExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Expression::AssignmentExpression(node)) } __ExpressionTag::BinaryExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Expression::BinaryExpression(node)) } __ExpressionTag::CallExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Expression::CallExpression(node)) } __ExpressionTag::ConditionalExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Expression::ConditionalExpression(node)) } __ExpressionTag::FunctionExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Expression::FunctionExpression(node)) } __ExpressionTag::Identifier => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Expression::Identifier(node)) } __ExpressionTag::Literal => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Expression::Literal(node)) } __ExpressionTag::LogicalExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Expression::LogicalExpression(node)) } __ExpressionTag::MemberExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Expression::MemberExpression(node)) } __ExpressionTag::NewExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Expression::NewExpression(node)) } __ExpressionTag::ObjectExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Expression::ObjectExpression(node)) } __ExpressionTag::SequenceExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Expression::SequenceExpression(node)) } __ExpressionTag::ThisExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Expression::ThisExpression(node)) } __ExpressionTag::UnaryExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Expression::UnaryExpression(node)) } __ExpressionTag::UpdateExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Expression::UpdateExpression(node)) } __ExpressionTag::YieldExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(Expression::YieldExpression(node)) } __ExpressionTag::JSXElement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Expression::JSXElement(node)) @@ -1067,33 +1009,30 @@ impl<'de> serde::Deserialize<'de> for ImportDeclarationSpecifier { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __ImportDeclarationSpecifierTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__ImportDeclarationSpecifierTag>::new( + "type", "Pattern", + ), )?; match tagged.0 { __ImportDeclarationSpecifierTag::ImportSpecifier => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ImportDeclarationSpecifier::ImportSpecifier(node)) } __ImportDeclarationSpecifierTag::ImportDefaultSpecifier => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ImportDeclarationSpecifier::ImportDefaultSpecifier(node)) } __ImportDeclarationSpecifierTag::ImportNamespaceSpecifier => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ImportDeclarationSpecifier::ImportNamespaceSpecifier(node)) } } @@ -1136,179 +1075,143 @@ impl<'de> serde::Deserialize<'de> for ModuleItem { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __ModuleItemTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__ModuleItemTag>::new("type", "Pattern"), )?; match tagged.0 { __ModuleItemTag::ImportDeclaration => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok( - ModuleItem::ImportOrExportDeclaration( - ImportOrExportDeclaration::ImportDeclaration(node), - ), - ) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ModuleItem::ImportOrExportDeclaration( + ImportOrExportDeclaration::ImportDeclaration(node), + )) } __ModuleItemTag::BlockStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ModuleItem::Statement(Statement::BlockStatement(node))) } __ModuleItemTag::BreakStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ModuleItem::Statement(Statement::BreakStatement(node))) } __ModuleItemTag::ContinueStatement => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ModuleItem::Statement(Statement::ContinueStatement(node))) } __ModuleItemTag::DebuggerStatement => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ModuleItem::Statement(Statement::DebuggerStatement(node))) } __ModuleItemTag::DoWhileStatement => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ModuleItem::Statement(Statement::DoWhileStatement(node))) } __ModuleItemTag::EmptyStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ModuleItem::Statement(Statement::EmptyStatement(node))) } __ModuleItemTag::ExpressionStatement => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ModuleItem::Statement(Statement::ExpressionStatement(node))) } __ModuleItemTag::ForInStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ModuleItem::Statement(Statement::ForInStatement(node))) } __ModuleItemTag::ForOfStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ModuleItem::Statement(Statement::ForOfStatement(node))) } __ModuleItemTag::ForStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ModuleItem::Statement(Statement::ForStatement(node))) } __ModuleItemTag::FunctionDeclaration => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ModuleItem::Statement(Statement::FunctionDeclaration(node))) } __ModuleItemTag::IfStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ModuleItem::Statement(Statement::IfStatement(node))) } __ModuleItemTag::LabeledStatement => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ModuleItem::Statement(Statement::LabeledStatement(node))) } __ModuleItemTag::ReturnStatement => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ModuleItem::Statement(Statement::ReturnStatement(node))) } __ModuleItemTag::SwitchStatement => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ModuleItem::Statement(Statement::SwitchStatement(node))) } __ModuleItemTag::ThrowStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ModuleItem::Statement(Statement::ThrowStatement(node))) } __ModuleItemTag::TryStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ModuleItem::Statement(Statement::TryStatement(node))) } __ModuleItemTag::VariableDeclaration => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ModuleItem::Statement(Statement::VariableDeclaration(node))) } __ModuleItemTag::WhileStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ModuleItem::Statement(Statement::WhileStatement(node))) } __ModuleItemTag::WithStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ModuleItem::Statement(Statement::WithStatement(node))) @@ -1332,17 +1235,16 @@ impl<'de> serde::Deserialize<'de> for ImportOrExportDeclaration { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __ImportOrExportDeclarationTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__ImportOrExportDeclarationTag>::new( + "type", "Pattern", + ), )?; match tagged.0 { __ImportOrExportDeclarationTag::ImportDeclaration => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ImportOrExportDeclaration::ImportDeclaration(node)) } } @@ -1384,175 +1286,172 @@ impl<'de> serde::Deserialize<'de> for ExpressionOrSuper { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __ExpressionOrSuperTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__ExpressionOrSuperTag>::new( + "type", "Pattern", + ), )?; match tagged.0 { __ExpressionOrSuperTag::ArrayExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSuper::Expression(Expression::ArrayExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSuper::Expression(Expression::ArrayExpression( + node, + ))) } __ExpressionOrSuperTag::ArrowFunctionExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok( - ExpressionOrSuper::Expression( - Expression::ArrowFunctionExpression(node), - ), - ) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSuper::Expression( + Expression::ArrowFunctionExpression(node), + )) } __ExpressionOrSuperTag::AssignmentExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSuper::Expression(Expression::AssignmentExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSuper::Expression( + Expression::AssignmentExpression(node), + )) } __ExpressionOrSuperTag::BinaryExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSuper::Expression(Expression::BinaryExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSuper::Expression(Expression::BinaryExpression( + node, + ))) } __ExpressionOrSuperTag::CallExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; - Ok(ExpressionOrSuper::Expression(Expression::CallExpression(node))) + Ok(ExpressionOrSuper::Expression(Expression::CallExpression( + node, + ))) } __ExpressionOrSuperTag::ConditionalExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok( - ExpressionOrSuper::Expression( - Expression::ConditionalExpression(node), - ), - ) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSuper::Expression( + Expression::ConditionalExpression(node), + )) } __ExpressionOrSuperTag::FunctionExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSuper::Expression(Expression::FunctionExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSuper::Expression( + Expression::FunctionExpression(node), + )) } __ExpressionOrSuperTag::Identifier => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ExpressionOrSuper::Expression(Expression::Identifier(node))) } __ExpressionOrSuperTag::Literal => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ExpressionOrSuper::Expression(Expression::Literal(node))) } __ExpressionOrSuperTag::LogicalExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSuper::Expression(Expression::LogicalExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSuper::Expression( + Expression::LogicalExpression(node), + )) } __ExpressionOrSuperTag::MemberExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSuper::Expression(Expression::MemberExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSuper::Expression(Expression::MemberExpression( + node, + ))) } __ExpressionOrSuperTag::NewExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; - Ok(ExpressionOrSuper::Expression(Expression::NewExpression(node))) + Ok(ExpressionOrSuper::Expression(Expression::NewExpression( + node, + ))) } __ExpressionOrSuperTag::ObjectExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSuper::Expression(Expression::ObjectExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSuper::Expression(Expression::ObjectExpression( + node, + ))) } __ExpressionOrSuperTag::SequenceExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSuper::Expression(Expression::SequenceExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSuper::Expression( + Expression::SequenceExpression(node), + )) } __ExpressionOrSuperTag::ThisExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; - Ok(ExpressionOrSuper::Expression(Expression::ThisExpression(node))) + Ok(ExpressionOrSuper::Expression(Expression::ThisExpression( + node, + ))) } __ExpressionOrSuperTag::UnaryExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSuper::Expression(Expression::UnaryExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSuper::Expression(Expression::UnaryExpression( + node, + ))) } __ExpressionOrSuperTag::UpdateExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSuper::Expression(Expression::UpdateExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSuper::Expression(Expression::UpdateExpression( + node, + ))) } __ExpressionOrSuperTag::YieldExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSuper::Expression(Expression::YieldExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSuper::Expression(Expression::YieldExpression( + node, + ))) } __ExpressionOrSuperTag::JSXElement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ExpressionOrSuper::Expression(Expression::JSXElement(node))) } __ExpressionOrSuperTag::Super => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ExpressionOrSuper::Super(node)) @@ -1596,179 +1495,172 @@ impl<'de> serde::Deserialize<'de> for ExpressionOrSpread { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __ExpressionOrSpreadTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__ExpressionOrSpreadTag>::new( + "type", "Pattern", + ), )?; match tagged.0 { __ExpressionOrSpreadTag::ArrayExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSpread::Expression(Expression::ArrayExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSpread::Expression(Expression::ArrayExpression( + node, + ))) } __ExpressionOrSpreadTag::ArrowFunctionExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok( - ExpressionOrSpread::Expression( - Expression::ArrowFunctionExpression(node), - ), - ) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSpread::Expression( + Expression::ArrowFunctionExpression(node), + )) } __ExpressionOrSpreadTag::AssignmentExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok( - ExpressionOrSpread::Expression( - Expression::AssignmentExpression(node), - ), - ) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSpread::Expression( + Expression::AssignmentExpression(node), + )) } __ExpressionOrSpreadTag::BinaryExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSpread::Expression(Expression::BinaryExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSpread::Expression( + Expression::BinaryExpression(node), + )) } __ExpressionOrSpreadTag::CallExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; - Ok(ExpressionOrSpread::Expression(Expression::CallExpression(node))) + Ok(ExpressionOrSpread::Expression(Expression::CallExpression( + node, + ))) } __ExpressionOrSpreadTag::ConditionalExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok( - ExpressionOrSpread::Expression( - Expression::ConditionalExpression(node), - ), - ) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSpread::Expression( + Expression::ConditionalExpression(node), + )) } __ExpressionOrSpreadTag::FunctionExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSpread::Expression(Expression::FunctionExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSpread::Expression( + Expression::FunctionExpression(node), + )) } __ExpressionOrSpreadTag::Identifier => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ExpressionOrSpread::Expression(Expression::Identifier(node))) } __ExpressionOrSpreadTag::Literal => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ExpressionOrSpread::Expression(Expression::Literal(node))) } __ExpressionOrSpreadTag::LogicalExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSpread::Expression(Expression::LogicalExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSpread::Expression( + Expression::LogicalExpression(node), + )) } __ExpressionOrSpreadTag::MemberExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSpread::Expression(Expression::MemberExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSpread::Expression( + Expression::MemberExpression(node), + )) } __ExpressionOrSpreadTag::NewExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; - Ok(ExpressionOrSpread::Expression(Expression::NewExpression(node))) + Ok(ExpressionOrSpread::Expression(Expression::NewExpression( + node, + ))) } __ExpressionOrSpreadTag::ObjectExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSpread::Expression(Expression::ObjectExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSpread::Expression( + Expression::ObjectExpression(node), + )) } __ExpressionOrSpreadTag::SequenceExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSpread::Expression(Expression::SequenceExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSpread::Expression( + Expression::SequenceExpression(node), + )) } __ExpressionOrSpreadTag::ThisExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; - Ok(ExpressionOrSpread::Expression(Expression::ThisExpression(node))) + Ok(ExpressionOrSpread::Expression(Expression::ThisExpression( + node, + ))) } __ExpressionOrSpreadTag::UnaryExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSpread::Expression(Expression::UnaryExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSpread::Expression(Expression::UnaryExpression( + node, + ))) } __ExpressionOrSpreadTag::UpdateExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSpread::Expression(Expression::UpdateExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSpread::Expression( + Expression::UpdateExpression(node), + )) } __ExpressionOrSpreadTag::YieldExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ExpressionOrSpread::Expression(Expression::YieldExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ExpressionOrSpread::Expression(Expression::YieldExpression( + node, + ))) } __ExpressionOrSpreadTag::JSXElement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ExpressionOrSpread::Expression(Expression::JSXElement(node))) } __ExpressionOrSpreadTag::SpreadElement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ExpressionOrSpread::SpreadElement(node)) @@ -1812,167 +1704,150 @@ impl<'de> serde::Deserialize<'de> for FunctionBody { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __FunctionBodyTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__FunctionBodyTag>::new("type", "Pattern"), )?; match tagged.0 { __FunctionBodyTag::BlockStatement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(FunctionBody::BlockStatement(node)) } __FunctionBodyTag::ArrayExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(FunctionBody::Expression(Expression::ArrayExpression(node))) } __FunctionBodyTag::ArrowFunctionExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(FunctionBody::Expression(Expression::ArrowFunctionExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(FunctionBody::Expression( + Expression::ArrowFunctionExpression(node), + )) } __FunctionBodyTag::AssignmentExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(FunctionBody::Expression(Expression::AssignmentExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(FunctionBody::Expression(Expression::AssignmentExpression( + node, + ))) } __FunctionBodyTag::BinaryExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(FunctionBody::Expression(Expression::BinaryExpression(node))) } __FunctionBodyTag::CallExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(FunctionBody::Expression(Expression::CallExpression(node))) } __FunctionBodyTag::ConditionalExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(FunctionBody::Expression(Expression::ConditionalExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(FunctionBody::Expression(Expression::ConditionalExpression( + node, + ))) } __FunctionBodyTag::FunctionExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(FunctionBody::Expression(Expression::FunctionExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(FunctionBody::Expression(Expression::FunctionExpression( + node, + ))) } __FunctionBodyTag::Identifier => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(FunctionBody::Expression(Expression::Identifier(node))) } __FunctionBodyTag::Literal => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(FunctionBody::Expression(Expression::Literal(node))) } __FunctionBodyTag::LogicalExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(FunctionBody::Expression(Expression::LogicalExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(FunctionBody::Expression(Expression::LogicalExpression( + node, + ))) } __FunctionBodyTag::MemberExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(FunctionBody::Expression(Expression::MemberExpression(node))) } __FunctionBodyTag::NewExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(FunctionBody::Expression(Expression::NewExpression(node))) } __FunctionBodyTag::ObjectExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(FunctionBody::Expression(Expression::ObjectExpression(node))) } __FunctionBodyTag::SequenceExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(FunctionBody::Expression(Expression::SequenceExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(FunctionBody::Expression(Expression::SequenceExpression( + node, + ))) } __FunctionBodyTag::ThisExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(FunctionBody::Expression(Expression::ThisExpression(node))) } __FunctionBodyTag::UnaryExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(FunctionBody::Expression(Expression::UnaryExpression(node))) } __FunctionBodyTag::UpdateExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(FunctionBody::Expression(Expression::UpdateExpression(node))) } __FunctionBodyTag::YieldExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(FunctionBody::Expression(Expression::YieldExpression(node))) } __FunctionBodyTag::JSXElement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(FunctionBody::Expression(Expression::JSXElement(node))) @@ -1996,15 +1871,11 @@ impl<'de> serde::Deserialize<'de> for Pattern { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __PatternTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__PatternTag>::new("type", "Pattern"), )?; match tagged.0 { __PatternTag::Identifier => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(Pattern::Identifier(node)) @@ -2048,169 +1919,143 @@ impl<'de> serde::Deserialize<'de> for ForInit { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __ForInitTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__ForInitTag>::new("type", "Pattern"), )?; match tagged.0 { __ForInitTag::ArrayExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ForInit::Expression(Expression::ArrayExpression(node))) } __ForInitTag::ArrowFunctionExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(ForInit::Expression(Expression::ArrowFunctionExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(ForInit::Expression(Expression::ArrowFunctionExpression( + node, + ))) } __ForInitTag::AssignmentExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ForInit::Expression(Expression::AssignmentExpression(node))) } __ForInitTag::BinaryExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ForInit::Expression(Expression::BinaryExpression(node))) } __ForInitTag::CallExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ForInit::Expression(Expression::CallExpression(node))) } __ForInitTag::ConditionalExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ForInit::Expression(Expression::ConditionalExpression(node))) } __ForInitTag::FunctionExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ForInit::Expression(Expression::FunctionExpression(node))) } __ForInitTag::Identifier => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ForInit::Expression(Expression::Identifier(node))) } __ForInitTag::Literal => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ForInit::Expression(Expression::Literal(node))) } __ForInitTag::LogicalExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ForInit::Expression(Expression::LogicalExpression(node))) } __ForInitTag::MemberExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ForInit::Expression(Expression::MemberExpression(node))) } __ForInitTag::NewExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ForInit::Expression(Expression::NewExpression(node))) } __ForInitTag::ObjectExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ForInit::Expression(Expression::ObjectExpression(node))) } __ForInitTag::SequenceExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ForInit::Expression(Expression::SequenceExpression(node))) } __ForInitTag::ThisExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ForInit::Expression(Expression::ThisExpression(node))) } __ForInitTag::UnaryExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ForInit::Expression(Expression::UnaryExpression(node))) } __ForInitTag::UpdateExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ForInit::Expression(Expression::UpdateExpression(node))) } __ForInitTag::YieldExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ForInit::Expression(Expression::YieldExpression(node))) } __ForInitTag::JSXElement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ForInit::Expression(Expression::JSXElement(node))) } __ForInitTag::VariableDeclaration => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ForInit::VariableDeclaration(node)) } } @@ -2234,25 +2079,20 @@ impl<'de> serde::Deserialize<'de> for ForInInit { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __ForInInitTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__ForInInitTag>::new("type", "Pattern"), )?; match tagged.0 { __ForInInitTag::Identifier => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(ForInInit::Pattern(Pattern::Identifier(node))) } __ForInInitTag::VariableDeclaration => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(ForInInit::VariableDeclaration(node)) } } @@ -2276,23 +2116,17 @@ impl<'de> serde::Deserialize<'de> for PropertyKey { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __PropertyKeyTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__PropertyKeyTag>::new("type", "Pattern"), )?; match tagged.0 { __PropertyKeyTag::Identifier => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(PropertyKey::Identifier(node)) } __PropertyKeyTag::Literal => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(PropertyKey::Literal(node)) @@ -2335,163 +2169,166 @@ impl<'de> serde::Deserialize<'de> for AssignmentTarget { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __AssignmentTargetTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__AssignmentTargetTag>::new( + "type", "Pattern", + ), )?; match tagged.0 { __AssignmentTargetTag::ArrayExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(AssignmentTarget::Expression(Expression::ArrayExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(AssignmentTarget::Expression(Expression::ArrayExpression( + node, + ))) } __AssignmentTargetTag::ArrowFunctionExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok( - AssignmentTarget::Expression( - Expression::ArrowFunctionExpression(node), - ), - ) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(AssignmentTarget::Expression( + Expression::ArrowFunctionExpression(node), + )) } __AssignmentTargetTag::AssignmentExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(AssignmentTarget::Expression(Expression::AssignmentExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(AssignmentTarget::Expression( + Expression::AssignmentExpression(node), + )) } __AssignmentTargetTag::BinaryExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(AssignmentTarget::Expression(Expression::BinaryExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(AssignmentTarget::Expression(Expression::BinaryExpression( + node, + ))) } __AssignmentTargetTag::CallExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; - Ok(AssignmentTarget::Expression(Expression::CallExpression(node))) + Ok(AssignmentTarget::Expression(Expression::CallExpression( + node, + ))) } __AssignmentTargetTag::ConditionalExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(AssignmentTarget::Expression(Expression::ConditionalExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(AssignmentTarget::Expression( + Expression::ConditionalExpression(node), + )) } __AssignmentTargetTag::FunctionExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(AssignmentTarget::Expression(Expression::FunctionExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(AssignmentTarget::Expression( + Expression::FunctionExpression(node), + )) } __AssignmentTargetTag::Identifier => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(AssignmentTarget::Expression(Expression::Identifier(node))) } __AssignmentTargetTag::Literal => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(AssignmentTarget::Expression(Expression::Literal(node))) } __AssignmentTargetTag::LogicalExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(AssignmentTarget::Expression(Expression::LogicalExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(AssignmentTarget::Expression(Expression::LogicalExpression( + node, + ))) } __AssignmentTargetTag::MemberExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(AssignmentTarget::Expression(Expression::MemberExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(AssignmentTarget::Expression(Expression::MemberExpression( + node, + ))) } __AssignmentTargetTag::NewExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; - Ok(AssignmentTarget::Expression(Expression::NewExpression(node))) + Ok(AssignmentTarget::Expression(Expression::NewExpression( + node, + ))) } __AssignmentTargetTag::ObjectExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(AssignmentTarget::Expression(Expression::ObjectExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(AssignmentTarget::Expression(Expression::ObjectExpression( + node, + ))) } __AssignmentTargetTag::SequenceExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(AssignmentTarget::Expression(Expression::SequenceExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(AssignmentTarget::Expression( + Expression::SequenceExpression(node), + )) } __AssignmentTargetTag::ThisExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; - Ok(AssignmentTarget::Expression(Expression::ThisExpression(node))) + Ok(AssignmentTarget::Expression(Expression::ThisExpression( + node, + ))) } __AssignmentTargetTag::UnaryExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(AssignmentTarget::Expression(Expression::UnaryExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(AssignmentTarget::Expression(Expression::UnaryExpression( + node, + ))) } __AssignmentTargetTag::UpdateExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(AssignmentTarget::Expression(Expression::UpdateExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(AssignmentTarget::Expression(Expression::UpdateExpression( + node, + ))) } __AssignmentTargetTag::YieldExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(AssignmentTarget::Expression(Expression::YieldExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(AssignmentTarget::Expression(Expression::YieldExpression( + node, + ))) } __AssignmentTargetTag::JSXElement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(AssignmentTarget::Expression(Expression::JSXElement(node))) @@ -2517,23 +2354,20 @@ impl<'de> serde::Deserialize<'de> for JSXMemberExpressionOrIdentifier { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __JSXMemberExpressionOrIdentifierTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__JSXMemberExpressionOrIdentifierTag>::new( + "type", "Pattern", + ), )?; match tagged.0 { __JSXMemberExpressionOrIdentifierTag::JSXMemberExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(JSXMemberExpressionOrIdentifier::JSXMemberExpression(node)) } __JSXMemberExpressionOrIdentifierTag::JSXIdentifier => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(JSXMemberExpressionOrIdentifier::JSXIdentifier(node)) @@ -2577,189 +2411,179 @@ impl<'de> serde::Deserialize<'de> for JSXExpressionOrEmpty { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __JSXExpressionOrEmptyTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__JSXExpressionOrEmptyTag>::new( + "type", "Pattern", + ), )?; match tagged.0 { __JSXExpressionOrEmptyTag::ArrayExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(JSXExpressionOrEmpty::Expression(Expression::ArrayExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(JSXExpressionOrEmpty::Expression( + Expression::ArrayExpression(node), + )) } __JSXExpressionOrEmptyTag::ArrowFunctionExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok( - JSXExpressionOrEmpty::Expression( - Expression::ArrowFunctionExpression(node), - ), - ) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(JSXExpressionOrEmpty::Expression( + Expression::ArrowFunctionExpression(node), + )) } __JSXExpressionOrEmptyTag::AssignmentExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok( - JSXExpressionOrEmpty::Expression( - Expression::AssignmentExpression(node), - ), - ) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(JSXExpressionOrEmpty::Expression( + Expression::AssignmentExpression(node), + )) } __JSXExpressionOrEmptyTag::BinaryExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(JSXExpressionOrEmpty::Expression(Expression::BinaryExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(JSXExpressionOrEmpty::Expression( + Expression::BinaryExpression(node), + )) } __JSXExpressionOrEmptyTag::CallExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; - Ok(JSXExpressionOrEmpty::Expression(Expression::CallExpression(node))) + Ok(JSXExpressionOrEmpty::Expression( + Expression::CallExpression(node), + )) } __JSXExpressionOrEmptyTag::ConditionalExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok( - JSXExpressionOrEmpty::Expression( - Expression::ConditionalExpression(node), - ), - ) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(JSXExpressionOrEmpty::Expression( + Expression::ConditionalExpression(node), + )) } __JSXExpressionOrEmptyTag::FunctionExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok( - JSXExpressionOrEmpty::Expression( - Expression::FunctionExpression(node), - ), - ) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(JSXExpressionOrEmpty::Expression( + Expression::FunctionExpression(node), + )) } __JSXExpressionOrEmptyTag::Identifier => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; - Ok(JSXExpressionOrEmpty::Expression(Expression::Identifier(node))) + Ok(JSXExpressionOrEmpty::Expression(Expression::Identifier( + node, + ))) } __JSXExpressionOrEmptyTag::Literal => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(JSXExpressionOrEmpty::Expression(Expression::Literal(node))) } __JSXExpressionOrEmptyTag::LogicalExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(JSXExpressionOrEmpty::Expression(Expression::LogicalExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(JSXExpressionOrEmpty::Expression( + Expression::LogicalExpression(node), + )) } __JSXExpressionOrEmptyTag::MemberExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(JSXExpressionOrEmpty::Expression(Expression::MemberExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(JSXExpressionOrEmpty::Expression( + Expression::MemberExpression(node), + )) } __JSXExpressionOrEmptyTag::NewExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; - Ok(JSXExpressionOrEmpty::Expression(Expression::NewExpression(node))) + Ok(JSXExpressionOrEmpty::Expression(Expression::NewExpression( + node, + ))) } __JSXExpressionOrEmptyTag::ObjectExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(JSXExpressionOrEmpty::Expression(Expression::ObjectExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(JSXExpressionOrEmpty::Expression( + Expression::ObjectExpression(node), + )) } __JSXExpressionOrEmptyTag::SequenceExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok( - JSXExpressionOrEmpty::Expression( - Expression::SequenceExpression(node), - ), - ) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(JSXExpressionOrEmpty::Expression( + Expression::SequenceExpression(node), + )) } __JSXExpressionOrEmptyTag::ThisExpression => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; - Ok(JSXExpressionOrEmpty::Expression(Expression::ThisExpression(node))) + Ok(JSXExpressionOrEmpty::Expression( + Expression::ThisExpression(node), + )) } __JSXExpressionOrEmptyTag::UnaryExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(JSXExpressionOrEmpty::Expression(Expression::UnaryExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(JSXExpressionOrEmpty::Expression( + Expression::UnaryExpression(node), + )) } __JSXExpressionOrEmptyTag::UpdateExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(JSXExpressionOrEmpty::Expression(Expression::UpdateExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(JSXExpressionOrEmpty::Expression( + Expression::UpdateExpression(node), + )) } __JSXExpressionOrEmptyTag::YieldExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; - Ok(JSXExpressionOrEmpty::Expression(Expression::YieldExpression(node))) + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; + Ok(JSXExpressionOrEmpty::Expression( + Expression::YieldExpression(node), + )) } __JSXExpressionOrEmptyTag::JSXElement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; - Ok(JSXExpressionOrEmpty::Expression(Expression::JSXElement(node))) + Ok(JSXExpressionOrEmpty::Expression(Expression::JSXElement( + node, + ))) } __JSXExpressionOrEmptyTag::JSXEmptyExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(JSXExpressionOrEmpty::JSXEmptyExpression(node)) } } @@ -2783,25 +2607,22 @@ impl<'de> serde::Deserialize<'de> for JSXAttributeOrSpread { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __JSXAttributeOrSpreadTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__JSXAttributeOrSpreadTag>::new( + "type", "Pattern", + ), )?; match tagged.0 { __JSXAttributeOrSpreadTag::JSXAttribute => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(JSXAttributeOrSpread::JSXAttribute(node)) } __JSXAttributeOrSpreadTag::JSXSpreadAttribute => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(JSXAttributeOrSpread::JSXSpreadAttribute(node)) } } @@ -2829,39 +2650,32 @@ impl<'de> serde::Deserialize<'de> for JSXAttributeValue { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __JSXAttributeValueTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__JSXAttributeValueTag>::new( + "type", "Pattern", + ), )?; match tagged.0 { __JSXAttributeValueTag::Literal => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(JSXAttributeValue::Literal(node)) } __JSXAttributeValueTag::JSXExpressionContainer => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(JSXAttributeValue::JSXExpressionContainer(node)) } __JSXAttributeValueTag::JSXElement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(JSXAttributeValue::JSXElement(node)) } __JSXAttributeValueTag::JSXFragment => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(JSXAttributeValue::JSXFragment(node)) @@ -2889,33 +2703,29 @@ impl<'de> serde::Deserialize<'de> for JSXElementName { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __JSXElementNameTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__JSXElementNameTag>::new( + "type", "Pattern", + ), )?; match tagged.0 { __JSXElementNameTag::JSXIdentifier => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(JSXElementName::JSXIdentifier(node)) } __JSXElementNameTag::JSXMemberExpression => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(JSXElementName::JSXMemberExpression(node)) } __JSXElementNameTag::JSXNamespacedName => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(JSXElementName::JSXNamespacedName(node)) } } @@ -2939,25 +2749,22 @@ impl<'de> serde::Deserialize<'de> for JSXIdentifierOrNamespacedName { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __JSXIdentifierOrNamespacedNameTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__JSXIdentifierOrNamespacedNameTag>::new( + "type", "Pattern", + ), )?; match tagged.0 { __JSXIdentifierOrNamespacedNameTag::JSXIdentifier => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(JSXIdentifierOrNamespacedName::JSXIdentifier(node)) } __JSXIdentifierOrNamespacedNameTag::JSXNamespacedName => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(JSXIdentifierOrNamespacedName::JSXNamespacedName(node)) } } @@ -2987,47 +2794,36 @@ impl<'de> serde::Deserialize<'de> for JSXChildItem { { let tagged = serde::Deserializer::deserialize_any( deserializer, - serde::__private::de::TaggedContentVisitor::< - __JSXChildItemTag, - >::new("type", "Pattern"), + serde::__private::de::TaggedContentVisitor::<__JSXChildItemTag>::new("type", "Pattern"), )?; match tagged.0 { __JSXChildItemTag::JSXText => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(JSXChildItem::JSXText(node)) } __JSXChildItemTag::JSXExpressionContainer => { - let node: Box = as Deserialize>::deserialize( - serde::__private::de::ContentDeserializer::::new(tagged.1), - )?; + let node: Box = + as Deserialize>::deserialize( + serde::__private::de::ContentDeserializer::::new(tagged.1), + )?; Ok(JSXChildItem::JSXExpressionContainer(node)) } __JSXChildItemTag::JSXSpreadChild => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(JSXChildItem::JSXSpreadChild(node)) } __JSXChildItemTag::JSXElement => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(JSXChildItem::JSXElement(node)) } __JSXChildItemTag::JSXFragment => { - let node: Box = as Deserialize>::deserialize( + let node: Box = as Deserialize>::deserialize( serde::__private::de::ContentDeserializer::::new(tagged.1), )?; Ok(JSXChildItem::JSXFragment(node)) diff --git a/compiler/forget/crates/forget_estree/src/js_value.rs b/compiler/forget/crates/forget_estree/src/js_value.rs index 3d23352a05..8f0fdfd92a 100644 --- a/compiler/forget/crates/forget_estree/src/js_value.rs +++ b/compiler/forget/crates/forget_estree/src/js_value.rs @@ -1,4 +1,5 @@ -use serde::{de::Visitor, Deserialize, Serialize}; +use serde::de::Visitor; +use serde::{Deserialize, Serialize}; #[derive(Serialize, Clone, Debug, PartialEq, PartialOrd, Hash)] pub enum JsValue { @@ -9,7 +10,18 @@ pub enum JsValue { String(String), } -#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Debug)] +#[derive( + Clone, + Copy, + PartialEq, + Eq, + PartialOrd, + Ord, + Hash, + Serialize, + Deserialize, + Debug +)] pub struct Number(u64); impl From for Number { diff --git a/compiler/forget/crates/forget_estree/src/lib.rs b/compiler/forget/crates/forget_estree/src/lib.rs index 7ffcc0ae71..dfd4cb8073 100644 --- a/compiler/forget/crates/forget_estree/src/lib.rs +++ b/compiler/forget/crates/forget_estree/src/lib.rs @@ -13,10 +13,11 @@ pub use visit::*; #[cfg(test)] mod tests { - use super::*; use insta::{assert_snapshot, glob}; use serde_json; + use super::*; + #[test] fn fixtures() { glob!("fixtures/**.json", |path| { diff --git a/compiler/forget/crates/forget_estree/src/range.rs b/compiler/forget/crates/forget_estree/src/range.rs index 2a044dd795..61c48191b8 100644 --- a/compiler/forget/crates/forget_estree/src/range.rs +++ b/compiler/forget/crates/forget_estree/src/range.rs @@ -2,7 +2,16 @@ use std::num::NonZeroU32; use serde::{Deserialize, Serialize}; -#[derive(Serialize, Deserialize, Copy, Clone, Debug, PartialEq, PartialOrd, Hash)] +#[derive( + Serialize, + Deserialize, + Copy, + Clone, + Debug, + PartialEq, + PartialOrd, + Hash +)] pub struct SourceRange { pub start: u32, pub end: NonZeroU32, diff --git a/compiler/forget/crates/forget_estree_codegen/src/codegen.rs b/compiler/forget/crates/forget_estree_codegen/src/codegen.rs index fbc5f64c26..58cf8981f0 100644 --- a/compiler/forget/crates/forget_estree_codegen/src/codegen.rs +++ b/compiler/forget/crates/forget_estree_codegen/src/codegen.rs @@ -1,7 +1,8 @@ use std::collections::HashSet; use indexmap::IndexMap; -use quote::{__private::TokenStream, format_ident, quote}; +use quote::__private::TokenStream; +use quote::{format_ident, quote}; use serde::{Deserialize, Serialize}; use syn::Type; diff --git a/compiler/forget/crates/forget_estree_swc/src/lib.rs b/compiler/forget/crates/forget_estree_swc/src/lib.rs index 546ad93bcf..3fa0e9fce2 100644 --- a/compiler/forget/crates/forget_estree_swc/src/lib.rs +++ b/compiler/forget/crates/forget_estree_swc/src/lib.rs @@ -1,4 +1,6 @@ -use std::{io::stderr, num::NonZeroU32, sync::Arc}; +use std::io::stderr; +use std::num::NonZeroU32; +use std::sync::Arc; use forget_estree::{Binding, BindingId}; use swc::Compiler; @@ -412,21 +414,22 @@ fn convert_assignment_target(cx: &Context, target: &PatOrExpr) -> forget_estree: PatOrExpr::Pat(target) => { forget_estree::AssignmentTarget::Pattern(convert_pattern(cx, target)) } - PatOrExpr::Expr(target) => { - match target.as_ref() { - Expr::Member(target) => forget_estree::AssignmentTarget::Expression( - forget_estree::Expression::MemberExpression(Box::new( - convert_member_expression(cx, target), - )), - ), - Expr::Ident(target) => forget_estree::AssignmentTarget::Pattern( - forget_estree::Pattern::Identifier(Box::new(convert_identifier(cx, target))), - ), - _ => { - panic!("Expected assignment target to be member expression or identifier, got {:#?}", target) - } + PatOrExpr::Expr(target) => match target.as_ref() { + Expr::Member(target) => forget_estree::AssignmentTarget::Expression( + forget_estree::Expression::MemberExpression(Box::new(convert_member_expression( + cx, target, + ))), + ), + Expr::Ident(target) => forget_estree::AssignmentTarget::Pattern( + forget_estree::Pattern::Identifier(Box::new(convert_identifier(cx, target))), + ), + _ => { + panic!( + "Expected assignment target to be member expression or identifier, got {:#?}", + target + ) } - } + }, } } diff --git a/compiler/forget/crates/forget_fixtures/tests/fixtures_test.rs b/compiler/forget/crates/forget_fixtures/tests/fixtures_test.rs index 870f5440b8..4b8639d8b6 100644 --- a/compiler/forget/crates/forget_fixtures/tests/fixtures_test.rs +++ b/compiler/forget/crates/forget_fixtures/tests/fixtures_test.rs @@ -1,4 +1,5 @@ -use std::{env, fmt::Write}; +use std::env; +use std::fmt::Write; use bumpalo::Bump; use forget_build_hir::build; diff --git a/compiler/forget/crates/forget_hir/src/basic_block.rs b/compiler/forget/crates/forget_hir/src/basic_block.rs index 87402c846a..ba51c42b60 100644 --- a/compiler/forget/crates/forget_hir/src/basic_block.rs +++ b/compiler/forget/crates/forget_hir/src/basic_block.rs @@ -2,7 +2,8 @@ use std::fmt::Display; use indexmap::{IndexMap, IndexSet}; -use crate::{id_types::BlockId, Identifier, InstrIx, Terminal}; +use crate::id_types::BlockId; +use crate::{Identifier, InstrIx, Terminal}; /// Represents a sequence of instructions that will always[1] execute /// consecutively. Concretely, a block may have zero or more instructions diff --git a/compiler/forget/crates/forget_hir/src/environment.rs b/compiler/forget/crates/forget_hir/src/environment.rs index 3df42082f6..bac1ce67b3 100644 --- a/compiler/forget/crates/forget_hir/src/environment.rs +++ b/compiler/forget/crates/forget_hir/src/environment.rs @@ -1,10 +1,10 @@ -use std::{ - cell::{Cell, RefCell}, - collections::HashMap, - rc::Rc, -}; +use std::cell::{Cell, RefCell}; +use std::collections::HashMap; +use std::rc::Rc; -use bumpalo::{boxed::Box, collections::Vec, Bump}; +use bumpalo::boxed::Box; +use bumpalo::collections::Vec; +use bumpalo::Bump; use forget_estree::BindingId; use crate::{ diff --git a/compiler/forget/crates/forget_hir/src/function.rs b/compiler/forget/crates/forget_hir/src/function.rs index cd876c1e33..9172491a62 100644 --- a/compiler/forget/crates/forget_hir/src/function.rs +++ b/compiler/forget/crates/forget_hir/src/function.rs @@ -1,7 +1,5 @@ -use bumpalo::{ - boxed::Box, - collections::{String, Vec}, -}; +use bumpalo::boxed::Box; +use bumpalo::collections::{String, Vec}; use indexmap::IndexMap; use crate::{BasicBlock, BlockId, IdentifierOperand, Instruction}; diff --git a/compiler/forget/crates/forget_hir/src/instruction.rs b/compiler/forget/crates/forget_hir/src/instruction.rs index 05e92ad299..dc7baa16a6 100644 --- a/compiler/forget/crates/forget_hir/src/instruction.rs +++ b/compiler/forget/crates/forget_hir/src/instruction.rs @@ -1,9 +1,9 @@ -use std::{cell::RefCell, fmt::Display, rc::Rc}; +use std::cell::RefCell; +use std::fmt::Display; +use std::rc::Rc; -use bumpalo::{ - boxed::Box, - collections::{String, Vec}, -}; +use bumpalo::boxed::Box; +use bumpalo::collections::{String, Vec}; use forget_estree::BinaryOperator; use crate::{Function, IdentifierId, InstrIx, InstructionId, ScopeId, Type}; diff --git a/compiler/forget/crates/forget_hir/src/terminal.rs b/compiler/forget/crates/forget_hir/src/terminal.rs index cf16d39b5e..b3f885557f 100644 --- a/compiler/forget/crates/forget_hir/src/terminal.rs +++ b/compiler/forget/crates/forget_hir/src/terminal.rs @@ -1,4 +1,5 @@ -use crate::{instruction::Operand, BlockId, InstructionId}; +use crate::instruction::Operand; +use crate::{BlockId, InstructionId}; /// Terminals represent statements or expressions that affect control flow, /// such as for-of, if-else, return, logical (??), ternaries (?:), etc. diff --git a/compiler/forget/crates/forget_ssa/src/enter.rs b/compiler/forget/crates/forget_ssa/src/enter.rs index a6249968b1..fc8f9f8f6c 100644 --- a/compiler/forget/crates/forget_ssa/src/enter.rs +++ b/compiler/forget/crates/forget_ssa/src/enter.rs @@ -1,4 +1,5 @@ -use std::{cell::RefCell, rc::Rc}; +use std::cell::RefCell; +use std::rc::Rc; use bumpalo::collections::{CollectIn, Vec}; use forget_hir::{ @@ -145,7 +146,10 @@ impl<'a, 'e, 'f> Builder<'a, 'e, 'f> { fn visit_store(&mut self, lvalue: &mut LValue<'a>) -> () { let old_identifier = &lvalue.identifier.identifier; // TODO: use Result (?) - assert!(!self.unknown.contains(&old_identifier.id), "EnterSSA: Expected identifier to be defined before being used. Identifier {old_identifier:?} is undefined."); + assert!( + !self.unknown.contains(&old_identifier.id), + "EnterSSA: Expected identifier to be defined before being used. Identifier {old_identifier:?} is undefined." + ); if self.context.contains(&old_identifier.id) { let new_identifier = self.get_id_at(self.current, old_identifier); diff --git a/compiler/forget/rustfmt.toml b/compiler/forget/rustfmt.toml new file mode 100644 index 0000000000..e8eb27da6a --- /dev/null +++ b/compiler/forget/rustfmt.toml @@ -0,0 +1,8 @@ +# Get help on options with `rustfmt --help=config` +# Please keep these in alphabetical order. +edition = "2021" +group_imports = "StdExternalCrate" +imports_granularity = "Module" +merge_derives = false +use_field_init_shorthand = true +version = "Two" \ No newline at end of file