{"commit":{"revision":"0a79974d0e87d9e12abc4bd43ec01ad5fef4df8d","authorEmail":"joesavona@fb.com","authoredAt":"2023-07-14T15:46:51+09:00","shortRevision":"0a79974d0e","authorName":"Joe Savona","subject":"[rust] Extract HIR initialization passes to hir crate"},"patch":"diff --git a\/compiler\/forget\/Cargo.lock b\/compiler\/forget\/Cargo.lock\nindex 06bba26e76..c08519d179 100644\n--- a\/compiler\/forget\/Cargo.lock\n+++ b\/compiler\/forget\/Cargo.lock\n@@ -521,10 +521,12 @@ name = \"forget_hir\"\n version = \"0.1.0\"\n dependencies = [\n \"bumpalo\",\n+ \"forget_diagnostics\",\n \"forget_estree\",\n \"forget_utils\",\n \"indexmap 2.0.0\",\n \"serde\",\n+ \"thiserror\",\n ]\n \n [[package]]\ndiff --git a\/compiler\/forget\/crates\/forget_build_hir\/src\/build.rs b\/compiler\/forget\/crates\/forget_build_hir\/src\/build.rs\nindex 37ef55ee73..97f9523e8e 100644\n--- a\/compiler\/forget\/crates\/forget_build_hir\/src\/build.rs\n+++ b\/compiler\/forget\/crates\/forget_build_hir\/src\/build.rs\n@@ -2,7 +2,7 @@ use std::collections::HashSet;\n \n use bumpalo::boxed::Box;\n use bumpalo::collections::String;\n-use forget_diagnostics::{Diagnostic, DiagnosticSeverity};\n+use forget_diagnostics::Diagnostic;\n use forget_estree::{\n AssignmentTarget, BinaryExpression, BlockStatement, Expression, ForInit, ForStatement,\n Function, FunctionExpression, IfStatement, JsValue, Literal, Pattern, Statement,\ndiff --git a\/compiler\/forget\/crates\/forget_build_hir\/src\/builder.rs b\/compiler\/forget\/crates\/forget_build_hir\/src\/builder.rs\nindex 7b13ac40f3..758a6e1155 100644\n--- a\/compiler\/forget\/crates\/forget_build_hir\/src\/builder.rs\n+++ b\/compiler\/forget\/crates\/forget_build_hir\/src\/builder.rs\n@@ -1,13 +1,13 @@\n use std::cell::RefCell;\n-use std::collections::HashSet;\n use std::rc::Rc;\n \n use bumpalo::boxed::Box;\n use bumpalo::collections::{String, Vec};\n-use forget_diagnostics::{invariant, Diagnostic, DiagnosticSeverity};\n+use forget_diagnostics::Diagnostic;\n use forget_hir::{\n- BasicBlock, BlockId, BlockKind, Environment, GotoKind, Identifier, IdentifierData, InstrIx,\n- Instruction, InstructionIdGenerator, InstructionValue, Terminal, TerminalValue, Type, HIR,\n+ initialize_hir, BasicBlock, BlockId, BlockKind, Environment, GotoKind, Identifier,\n+ IdentifierData, InstrIx, Instruction, InstructionIdGenerator, InstructionValue, Terminal,\n+ TerminalValue, Type, HIR,\n };\n use indexmap::IndexMap;\n \n@@ -346,161 +346,3 @@ impl<'a> Builder<'a> {\n }\n }\n }\n-\n-pub fn initialize_hir<'a>(hir: &mut HIR<'a>) -> Result<(), Diagnostic> {\n- reverse_postorder_blocks(hir);\n- remove_unreachable_for_updates(hir);\n- remove_unreachable_fallthroughs(hir);\n- remove_unreachable_do_while_statements(hir);\n- mark_instruction_ids(hir)?;\n- mark_predecessors(hir);\n- Ok(())\n-}\n-\n-\/\/\/ Modifies the HIR to put the blocks in reverse postorder, with predecessors before\n-\/\/\/ successors (except for the case of loops)\n-pub fn reverse_postorder_blocks<'a>(hir: &mut HIR<'a>) {\n- let mut visited = HashSet::::with_capacity(hir.blocks.len());\n- let mut postorder = std::vec::Vec::::with_capacity(hir.blocks.len());\n- fn visit<'a>(\n- block_id: BlockId,\n- hir: &HIR<'a>,\n- visited: &mut HashSet,\n- postorder: &mut std::vec::Vec,\n- ) {\n- if !visited.insert(block_id) {\n- \/\/ already visited\n- return;\n- }\n- let block = hir.block(block_id);\n- let terminal = &block.terminal;\n- match &terminal.value {\n- TerminalValue::Branch(terminal) => {\n- visit(terminal.alternate, hir, visited, postorder);\n- visit(terminal.consequent, hir, visited, postorder);\n- }\n- TerminalValue::If(terminal) => {\n- visit(terminal.alternate, hir, visited, postorder);\n- visit(terminal.consequent, hir, visited, postorder);\n- }\n- TerminalValue::For(terminal) => {\n- visit(terminal.init, hir, visited, postorder);\n- }\n- TerminalValue::DoWhile(terminal) => {\n- visit(terminal.body, hir, visited, postorder);\n- }\n- TerminalValue::Goto(terminal) => {\n- visit(terminal.block, hir, visited, postorder);\n- }\n- TerminalValue::Return(..) => { \/* no-op *\/ }\n- TerminalValue::Unsupported(..) => {\n- panic!(\"Unexpected unsupported terminal\")\n- }\n- }\n- postorder.push(block_id);\n- }\n- visit(hir.entry, &hir, &mut visited, &mut postorder);\n-\n- \/\/ NOTE: could consider sorting the blocks in-place by key\n- let mut blocks = IndexMap::with_capacity(hir.blocks.len());\n- for id in postorder.iter().rev().cloned() {\n- blocks.insert(id, hir.blocks.remove(&id).unwrap());\n- }\n-\n- hir.blocks = blocks;\n-}\n-\n-\/\/\/ Prunes ForTerminal.update values (sets to None) if they are unreachable\n-pub fn remove_unreachable_for_updates<'a>(hir: &mut HIR<'a>) {\n- let block_ids: HashSet = hir.blocks.keys().cloned().collect();\n-\n- for block in hir.blocks.values_mut() {\n- if let TerminalValue::For(terminal) = &mut block.terminal.value {\n- if let Some(update) = terminal.update {\n- if !block_ids.contains(&update) {\n- terminal.update = None;\n- }\n- }\n- }\n- }\n-}\n-\n-\/\/\/ Prunes unreachable fallthrough values, setting them to None if the referenced\n-\/\/\/ block was not otherwise reachable.\n-pub fn remove_unreachable_fallthroughs<'a>(hir: &mut HIR<'a>) {\n- let block_ids: HashSet = hir.blocks.keys().cloned().collect();\n-\n- for block in hir.blocks.values_mut() {\n- block\n- .terminal\n- .value\n- .map_optional_fallthroughs(|fallthrough| {\n- if block_ids.contains(&fallthrough) {\n- Some(fallthrough)\n- } else {\n- None\n- }\n- })\n- }\n-}\n-\n-\/\/\/ Rewrites DoWhile statements into Gotos if the test block is not reachable\n-pub fn remove_unreachable_do_while_statements<'a>(hir: &mut HIR<'a>) {\n- let block_ids: HashSet = hir.blocks.keys().cloned().collect();\n-\n- for block in hir.blocks.values_mut() {\n- if let TerminalValue::DoWhile(terminal) = &mut block.terminal.value {\n- if !block_ids.contains(&terminal.test) {\n- block.terminal.value = TerminalValue::Goto(forget_hir::GotoTerminal {\n- block: terminal.body,\n- kind: GotoKind::Break,\n- });\n- }\n- }\n- }\n-}\n-\n-\/\/\/ Updates the instruction ids for all instructions and blocks\n-\/\/\/ Relies on the blocks being in reverse postorder to ensure that id ordering is correct\n-pub fn mark_instruction_ids<'a>(hir: &mut HIR<'a>) -> Result<(), Diagnostic> {\n- let mut id_gen = InstructionIdGenerator::new();\n- let mut visited = HashSet::<(usize, usize)>::new();\n- for (ii, block) in hir.blocks.values_mut().enumerate() {\n- let block_id = block.id;\n- for (jj, instr_ix) in block.instructions.iter_mut().enumerate() {\n- invariant(visited.insert((ii, jj)), || {\n- Diagnostic::invariant(BuildHIRError::BlockVisitedTwice { block: block_id }, None)\n- })?;\n- let instr = &mut hir.instructions[usize::from(*instr_ix)];\n- instr.id = id_gen.next();\n- }\n- block.terminal.id = id_gen.next();\n- }\n- Ok(())\n-}\n-\n-\/\/\/ Updates the predecessors of each block\n-pub fn mark_predecessors<'a>(hir: &mut HIR<'a>) {\n- for block in hir.blocks.values_mut() {\n- block.predecessors.clear();\n- }\n- let mut visited = HashSet::::with_capacity(hir.blocks.len());\n- fn visit<'a>(\n- block_id: BlockId,\n- prev_id: Option,\n- hir: &mut HIR<'a>,\n- visited: &mut HashSet,\n- ) {\n- let block = hir.block_mut(block_id);\n- if let Some(prev_id) = prev_id {\n- block.predecessors.insert(prev_id);\n- }\n- if !visited.insert(block_id) {\n- return;\n- }\n- for successor in block.terminal.value.successors() {\n- visit(successor, Some(block_id), hir, visited)\n- }\n- }\n- visit(hir.entry, None, hir, &mut visited);\n-}\ndiff --git a\/compiler\/forget\/crates\/forget_build_hir\/src\/error.rs b\/compiler\/forget\/crates\/forget_build_hir\/src\/error.rs\nindex d8a00fd52d..954b0c30a9 100644\n--- a\/compiler\/forget\/crates\/forget_build_hir\/src\/error.rs\n+++ b\/compiler\/forget\/crates\/forget_build_hir\/src\/error.rs\n@@ -1,4 +1,3 @@\n-use forget_hir::BlockId;\n use thiserror::Error;\n \n \/\/\/ Errors which can occur during HIR construction\n@@ -32,10 +31,6 @@ pub enum BuildHIRError {\n #[error(\"React functions may not reassign variables defined outside of the component or hook\")]\n ReassignedGlobal,\n \n- \/\/\/ ErrorSeverity::Invariant\n- #[error(\"Invariant: Expected block {block} not to have been visited yet\")]\n- BlockVisitedTwice { block: BlockId },\n-\n \/\/\/ ErrorSeverity::InvalidSyntax\n #[error(\"Could not resolve a target for `break` statement\")]\n UnresolvedBreakTarget,\ndiff --git a\/compiler\/forget\/crates\/forget_build_hir\/src\/lib.rs b\/compiler\/forget\/crates\/forget_build_hir\/src\/lib.rs\nindex 69632dcbd7..71210aa421 100644\n--- a\/compiler\/forget\/crates\/forget_build_hir\/src\/lib.rs\n+++ b\/compiler\/forget\/crates\/forget_build_hir\/src\/lib.rs\n@@ -4,9 +4,4 @@ mod context;\n mod error;\n \n pub use build::build;\n-pub use builder::{\n- initialize_hir, mark_instruction_ids, mark_predecessors,\n- remove_unreachable_do_while_statements, remove_unreachable_fallthroughs,\n- remove_unreachable_for_updates, reverse_postorder_blocks,\n-};\n pub use error::*;\ndiff --git a\/compiler\/forget\/crates\/forget_estree\/src\/generated.rs b\/compiler\/forget\/crates\/forget_estree\/src\/generated.rs\nindex 1e8661b41c..474a658936 100644\n--- a\/compiler\/forget\/crates\/forget_estree\/src\/generated.rs\n+++ b\/compiler\/forget\/crates\/forget_estree\/src\/generated.rs\n@@ -1,8 +1,6 @@\n use std::num::NonZeroU32;\n-\n-use serde::{Deserialize, Serialize};\n-\n-use crate::{Binding, JsValue, SourceRange};\n+use serde::{Serialize, Deserialize};\n+use crate::{JsValue, Binding, SourceRange};\n #[derive(Serialize, Deserialize, Clone, Debug)]\n pub struct SourceLocation {\n pub source: Option,\n@@ -669,134 +667,167 @@ impl<'de> serde::Deserialize<'de> for Statement {\n {\n let tagged = serde::Deserializer::deserialize_any(\n deserializer,\n- serde::__private::de::TaggedContentVisitor::<__StatementTag>::new(\"type\", \"Pattern\"),\n+ serde::__private::de::TaggedContentVisitor::<\n+ __StatementTag,\n+ >::new(\"type\", \"Pattern\"),\n )?;\n match tagged.0 {\n __StatementTag::BlockStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Statement::BlockStatement(node))\n }\n __StatementTag::BreakStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Statement::BreakStatement(node))\n }\n __StatementTag::ContinueStatement => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Statement::ContinueStatement(node))\n }\n __StatementTag::DebuggerStatement => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Statement::DebuggerStatement(node))\n }\n __StatementTag::DoWhileStatement => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Statement::DoWhileStatement(node))\n }\n __StatementTag::EmptyStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Statement::EmptyStatement(node))\n }\n __StatementTag::ExpressionStatement => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Statement::ExpressionStatement(node))\n }\n __StatementTag::ForInStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Statement::ForInStatement(node))\n }\n __StatementTag::ForOfStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Statement::ForOfStatement(node))\n }\n __StatementTag::ForStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Statement::ForStatement(node))\n }\n __StatementTag::FunctionDeclaration => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Statement::FunctionDeclaration(node))\n }\n __StatementTag::IfStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Statement::IfStatement(node))\n }\n __StatementTag::LabeledStatement => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Statement::LabeledStatement(node))\n }\n __StatementTag::ReturnStatement => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Statement::ReturnStatement(node))\n }\n __StatementTag::SwitchStatement => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Statement::SwitchStatement(node))\n }\n __StatementTag::ThrowStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Statement::ThrowStatement(node))\n }\n __StatementTag::TryStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Statement::TryStatement(node))\n }\n __StatementTag::VariableDeclaration => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Statement::VariableDeclaration(node))\n }\n __StatementTag::WhileStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Statement::WhileStatement(node))\n }\n __StatementTag::WithStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Statement::WithStatement(node))\n@@ -856,132 +887,159 @@ impl<'de> serde::Deserialize<'de> for Expression {\n {\n let tagged = serde::Deserializer::deserialize_any(\n deserializer,\n- serde::__private::de::TaggedContentVisitor::<__ExpressionTag>::new(\"type\", \"Pattern\"),\n+ serde::__private::de::TaggedContentVisitor::<\n+ __ExpressionTag,\n+ >::new(\"type\", \"Pattern\"),\n )?;\n match tagged.0 {\n __ExpressionTag::ArrayExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Expression::ArrayExpression(node))\n }\n __ExpressionTag::ArrowFunctionExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Expression::ArrowFunctionExpression(node))\n }\n __ExpressionTag::AssignmentExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Expression::AssignmentExpression(node))\n }\n __ExpressionTag::BinaryExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Expression::BinaryExpression(node))\n }\n __ExpressionTag::CallExpression => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Expression::CallExpression(node))\n }\n __ExpressionTag::ConditionalExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Expression::ConditionalExpression(node))\n }\n __ExpressionTag::FunctionExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Expression::FunctionExpression(node))\n }\n __ExpressionTag::Identifier => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Expression::Identifier(node))\n }\n __ExpressionTag::Literal => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Expression::Literal(node))\n }\n __ExpressionTag::LogicalExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Expression::LogicalExpression(node))\n }\n __ExpressionTag::MemberExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Expression::MemberExpression(node))\n }\n __ExpressionTag::NewExpression => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Expression::NewExpression(node))\n }\n __ExpressionTag::ObjectExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Expression::ObjectExpression(node))\n }\n __ExpressionTag::SequenceExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Expression::SequenceExpression(node))\n }\n __ExpressionTag::ThisExpression => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Expression::ThisExpression(node))\n }\n __ExpressionTag::UnaryExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Expression::UnaryExpression(node))\n }\n __ExpressionTag::UpdateExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Expression::UpdateExpression(node))\n }\n __ExpressionTag::YieldExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(Expression::YieldExpression(node))\n }\n __ExpressionTag::JSXElement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(Expression::JSXElement(node))\n@@ -1009,30 +1067,33 @@ impl<'de> serde::Deserialize<'de> for ImportDeclarationSpecifier {\n {\n let tagged = serde::Deserializer::deserialize_any(\n deserializer,\n- serde::__private::de::TaggedContentVisitor::<__ImportDeclarationSpecifierTag>::new(\n- \"type\", \"Pattern\",\n- ),\n+ serde::__private::de::TaggedContentVisitor::<\n+ __ImportDeclarationSpecifierTag,\n+ >::new(\"type\", \"Pattern\"),\n )?;\n match tagged.0 {\n __ImportDeclarationSpecifierTag::ImportSpecifier => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(ImportDeclarationSpecifier::ImportSpecifier(node))\n }\n __ImportDeclarationSpecifierTag::ImportDefaultSpecifier => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(ImportDeclarationSpecifier::ImportDefaultSpecifier(node))\n }\n __ImportDeclarationSpecifierTag::ImportNamespaceSpecifier => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(ImportDeclarationSpecifier::ImportNamespaceSpecifier(node))\n }\n }\n@@ -1075,143 +1136,179 @@ impl<'de> serde::Deserialize<'de> for ModuleItem {\n {\n let tagged = serde::Deserializer::deserialize_any(\n deserializer,\n- serde::__private::de::TaggedContentVisitor::<__ModuleItemTag>::new(\"type\", \"Pattern\"),\n+ serde::__private::de::TaggedContentVisitor::<\n+ __ModuleItemTag,\n+ >::new(\"type\", \"Pattern\"),\n )?;\n match tagged.0 {\n __ModuleItemTag::ImportDeclaration => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n- Ok(ModuleItem::ImportOrExportDeclaration(\n- ImportOrExportDeclaration::ImportDeclaration(node),\n- ))\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(\n+ ModuleItem::ImportOrExportDeclaration(\n+ ImportOrExportDeclaration::ImportDeclaration(node),\n+ ),\n+ )\n }\n __ModuleItemTag::BlockStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(ModuleItem::Statement(Statement::BlockStatement(node)))\n }\n __ModuleItemTag::BreakStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(ModuleItem::Statement(Statement::BreakStatement(node)))\n }\n __ModuleItemTag::ContinueStatement => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(ModuleItem::Statement(Statement::ContinueStatement(node)))\n }\n __ModuleItemTag::DebuggerStatement => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(ModuleItem::Statement(Statement::DebuggerStatement(node)))\n }\n __ModuleItemTag::DoWhileStatement => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(ModuleItem::Statement(Statement::DoWhileStatement(node)))\n }\n __ModuleItemTag::EmptyStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(ModuleItem::Statement(Statement::EmptyStatement(node)))\n }\n __ModuleItemTag::ExpressionStatement => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(ModuleItem::Statement(Statement::ExpressionStatement(node)))\n }\n __ModuleItemTag::ForInStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(ModuleItem::Statement(Statement::ForInStatement(node)))\n }\n __ModuleItemTag::ForOfStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(ModuleItem::Statement(Statement::ForOfStatement(node)))\n }\n __ModuleItemTag::ForStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(ModuleItem::Statement(Statement::ForStatement(node)))\n }\n __ModuleItemTag::FunctionDeclaration => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(ModuleItem::Statement(Statement::FunctionDeclaration(node)))\n }\n __ModuleItemTag::IfStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(ModuleItem::Statement(Statement::IfStatement(node)))\n }\n __ModuleItemTag::LabeledStatement => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(ModuleItem::Statement(Statement::LabeledStatement(node)))\n }\n __ModuleItemTag::ReturnStatement => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(ModuleItem::Statement(Statement::ReturnStatement(node)))\n }\n __ModuleItemTag::SwitchStatement => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(ModuleItem::Statement(Statement::SwitchStatement(node)))\n }\n __ModuleItemTag::ThrowStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(ModuleItem::Statement(Statement::ThrowStatement(node)))\n }\n __ModuleItemTag::TryStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(ModuleItem::Statement(Statement::TryStatement(node)))\n }\n __ModuleItemTag::VariableDeclaration => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(ModuleItem::Statement(Statement::VariableDeclaration(node)))\n }\n __ModuleItemTag::WhileStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(ModuleItem::Statement(Statement::WhileStatement(node)))\n }\n __ModuleItemTag::WithStatement => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n Ok(ModuleItem::Statement(Statement::WithStatement(node)))\n@@ -1235,16 +1332,17 @@ impl<'de> serde::Deserialize<'de> for ImportOrExportDeclaration {\n {\n let tagged = serde::Deserializer::deserialize_any(\n deserializer,\n- serde::__private::de::TaggedContentVisitor::<__ImportOrExportDeclarationTag>::new(\n- \"type\", \"Pattern\",\n- ),\n+ serde::__private::de::TaggedContentVisitor::<\n+ __ImportOrExportDeclarationTag,\n+ >::new(\"type\", \"Pattern\"),\n )?;\n match tagged.0 {\n __ImportOrExportDeclarationTag::ImportDeclaration => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n Ok(ImportOrExportDeclaration::ImportDeclaration(node))\n }\n }\n@@ -1286,172 +1384,175 @@ impl<'de> serde::Deserialize<'de> for ExpressionOrSuper {\n {\n let tagged = serde::Deserializer::deserialize_any(\n deserializer,\n- serde::__private::de::TaggedContentVisitor::<__ExpressionOrSuperTag>::new(\n- \"type\", \"Pattern\",\n- ),\n+ serde::__private::de::TaggedContentVisitor::<\n+ __ExpressionOrSuperTag,\n+ >::new(\"type\", \"Pattern\"),\n )?;\n match tagged.0 {\n __ExpressionOrSuperTag::ArrayExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n- Ok(ExpressionOrSuper::Expression(Expression::ArrayExpression(\n- node,\n- )))\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(ExpressionOrSuper::Expression(Expression::ArrayExpression(node)))\n }\n __ExpressionOrSuperTag::ArrowFunctionExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n- Ok(ExpressionOrSuper::Expression(\n- Expression::ArrowFunctionExpression(node),\n- ))\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(\n+ ExpressionOrSuper::Expression(\n+ Expression::ArrowFunctionExpression(node),\n+ ),\n+ )\n }\n __ExpressionOrSuperTag::AssignmentExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n- Ok(ExpressionOrSuper::Expression(\n- Expression::AssignmentExpression(node),\n- ))\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(ExpressionOrSuper::Expression(Expression::AssignmentExpression(node)))\n }\n __ExpressionOrSuperTag::BinaryExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n- Ok(ExpressionOrSuper::Expression(Expression::BinaryExpression(\n- node,\n- )))\n+ let node: Box = as Deserialize>::deserialize(\n+ serde::__private::de::ContentDeserializer::::new(tagged.1),\n+ )?;\n+ Ok(ExpressionOrSuper::Expression(Expression::BinaryExpression(node)))\n }\n __ExpressionOrSuperTag::CallExpression => {\n- let node: Box = as Deserialize>::deserialize(\n+ let node: Box = as Deserialize>::deserialize(\n serde::__private::de::ContentDeserializer::::new(tagged.1),\n )?;\n- Ok(ExpressionOrSuper::Expression(Expression::CallExpression(\n- node,\n- )))\n+ Ok(ExpressionOrSuper::Expression(Expression::CallExpression(node)))\n }\n __ExpressionOrSuperTag::ConditionalExpression => {\n- let node: Box =\n- as Deserialize>::deserialize(\n- serde::__private::de::ContentDeserializer::::new(tagged.1),\n- )?;\n- Ok(ExpressionOrSuper::Expression(\n- Expression::ConditionalExpression(node),\n- ))\n+ let node: Box =

dillon1000/react

Files changed