{"files":[{"path":"compiler\/.github\/workflows\/rust.yml","status":"M"},{"path":"compiler\/forget\/crates\/forget_build_hir\/src\/build.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_diagnostics\/src\/diagnostic.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_estree\/src\/generated.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_estree\/src\/js_value.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_estree\/src\/lib.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_estree\/src\/visit.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_estree_codegen\/src\/codegen.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_hermes_parser\/src\/generated.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_hermes_parser\/src\/generated_extension.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_hermes_parser\/src\/lib.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_hermes_parser\/tests\/parser_test.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_hir\/src\/function.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_hir\/src\/instruction.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_hir\/src\/terminal.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_optimization\/src\/constant_propagation.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_semantic_analysis\/src\/analyzer.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_semantic_analysis\/src\/scope_view.rs","status":"M"},{"path":"compiler\/forget\/crates\/forget_ssa\/src\/enter.rs","status":"M"}],"body":"Formats the codebase, fixes some clippy lints, and updates CI to check that code \nis formatted.","patch":"diff --git a\/compiler\/.github\/workflows\/rust.yml b\/compiler\/.github\/workflows\/rust.yml\nindex 23ff98b663..fe69046873 100644\n--- a\/compiler\/.github\/workflows\/rust.yml\n+++ b\/compiler\/.github\/workflows\/rust.yml\n@@ -17,15 +17,53 @@ on:\n \n env:\n CARGO_TERM_COLOR: always\n+ RUSTFLAGS: -Dwarnings\n \n jobs:\n test:\n- runs-on: ubuntu-latest\n+ name: Rust Test (${{ matrix.target.os }})\n+ strategy:\n+ matrix:\n+ target:\n+ - target: ubuntu-latest\n+ os: ubuntu-latest\n+ # TODO: run on more platforms\n+ # - target: macos-latest\n+ # os: macos-latest\n+ # - target: windows-latest\n+ # os: windows-latest\n+ runs-on: ${{ matrix.target.os }}\n steps:\n - uses: actions\/checkout@v3\n- - name: Build\n- run: cargo build --verbose\n+ - name: cargo test\n working-directory: forget\n- - name: Run tests\n- run: cargo test --verbose\n+ run: cargo test --manifest-path=Cargo.toml --locked ${{ matrix.target.features && '--features' }} ${{ matrix.target.features }}\n+\n+ lint:\n+ name: Rust Lint\n+ runs-on: ubuntu-latest\n+ steps:\n+ - uses: actions\/checkout@v2\n+ - uses: actions-rs\/toolchain@v1\n+ with:\n+ # NOTE: use `rustup run ` in commands below\n+ # with this exact same toolchain value\n+ toolchain: nightly-2023-08-01\n+ override: true\n+ components: rustfmt, clippy\n+ - name: rustfmt\n+ run: grep -r --include \"*.rs\" --files-without-match \"@generated\" crates | xargs rustup run nightly-2023-08-01 rustfmt --check --config=\"skip_children=true\"\n+ working-directory: .\/forget\/\n+ # - name: cargo clippy\n+ # working-directory: forget\n+ # run: rustup run nightly-2023-08-01 cargo clippy -- -Dclippy::correctness\n+\n+ build:\n+ name: Rust Build\n+ runs-on: ubuntu-latest\n+ # TODO: build on more platforms, deploy, etc\n+ steps:\n+ - uses: actions\/checkout@v3\n+ - name: cargo build\n working-directory: forget\n+ run: cargo build --release\ndiff --git a\/compiler\/forget\/crates\/forget_build_hir\/src\/build.rs b\/compiler\/forget\/crates\/forget_build_hir\/src\/build.rs\nindex c2ef985b3d..9298b437a2 100644\n--- a\/compiler\/forget\/crates\/forget_build_hir\/src\/build.rs\n+++ b\/compiler\/forget\/crates\/forget_build_hir\/src\/build.rs\n@@ -374,13 +374,13 @@ fn lower_expression(\n Expression::AssignmentExpression(expr) => match expr.operator {\n forget_estree::AssignmentOperator::Equals => {\n let right = lower_expression(env, builder, &expr.right)?;\n- return Ok(lower_assignment(\n+ return lower_assignment(\n env,\n builder,\n InstructionKind::Reassign,\n &expr.left,\n right,\n- )?);\n+ );\n }\n _ => todo!(\"lower assignment expr {:#?}\", expr),\n },\n@@ -418,7 +418,7 @@ fn lower_expression(\n return Err(Diagnostic::todo(\"Support method calls\", expr.range));\n }\n \n- let callee = lower_expression(env, builder, &callee_expr)?;\n+ let callee = lower_expression(env, builder, callee_expr)?;\n let arguments = lower_arguments(env, builder, &expr.arguments)?;\n InstructionValue::Call(forget_hir::Call { callee, arguments })\n }\n@@ -568,7 +568,7 @@ fn lower_assignment_pattern(\n None => items.push(ArrayDestructureItem::Hole),\n Some(Pattern::Identifier(element)) => {\n let identifier =\n- lower_identifier_for_assignment(env, builder, kind, &element)?;\n+ lower_identifier_for_assignment(env, builder, kind, element)?;\n items.push(ArrayDestructureItem::Value(identifier));\n }\n Some(Pattern::RestElement(element)) => {\ndiff --git a\/compiler\/forget\/crates\/forget_diagnostics\/src\/diagnostic.rs b\/compiler\/forget\/crates\/forget_diagnostics\/src\/diagnostic.rs\nindex b0b3e19b54..af4740bad4 100644\n--- a\/compiler\/forget\/crates\/forget_diagnostics\/src\/diagnostic.rs\n+++ b\/compiler\/forget\/crates\/forget_diagnostics\/src\/diagnostic.rs\n@@ -2,7 +2,7 @@ use std::error::Error;\n use std::fmt::{Debug, Display, Write};\n \n use forget_estree::SourceRange;\n-use miette::{ByteOffset, SourceSpan};\n+use miette::SourceSpan;\n use static_assertions::assert_impl_all;\n use thiserror::Error;\n \n@@ -189,7 +189,7 @@ impl Diagnostic {\n \n impl Display for Diagnostic {\n fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {\n- write!(f, \"{}\", self.0.message.to_string())\n+ write!(f, \"{}\", self.0.message)\n }\n }\n \n@@ -272,7 +272,7 @@ impl From for Diagnostics {\n \n fn source_span_from_range(range: SourceRange) -> SourceSpan {\n SourceSpan::new(\n- ByteOffset::from(range.start as usize).into(),\n- ByteOffset::from((u32::from(range.end) - range.start) as usize).into(),\n+ (range.start as usize).into(),\n+ ((u32::from(range.end) - range.start) as usize).into(),\n )\n }\ndiff --git a\/compiler\/forget\/crates\/forget_estree\/src\/generated.rs b\/compiler\/forget\/crates\/forget_estree\/src\/generated.rs\nindex 1caca408d2..332f052a7e 100644\n--- a\/compiler\/forget\/crates\/forget_estree\/src\/generated.rs\n+++ b\/compiler\/forget\/crates\/forget_estree\/src\/generated.rs\n@@ -3,6 +3,7 @@\n #![allow(dead_code)]\n #![allow(unused_variables)]\n #![allow(non_snake_case)]\n+#![allow(clippy::enum_variant_names)]\n use std::num::NonZeroU32;\n use serde::ser::{Serializer, SerializeMap};\n use serde::{Serialize, Deserialize};\ndiff --git a\/compiler\/forget\/crates\/forget_estree\/src\/js_value.rs b\/compiler\/forget\/crates\/forget_estree\/src\/js_value.rs\nindex 48471a3a17..7a44f85216 100644\n--- a\/compiler\/forget\/crates\/forget_estree\/src\/js_value.rs\n+++ b\/compiler\/forget\/crates\/forget_estree\/src\/js_value.rs\n@@ -15,7 +15,7 @@ impl JsValue {\n match &self {\n JsValue::Boolean(value) => *value,\n JsValue::Number(value) => value.is_truthy(),\n- JsValue::String(value) => value.len() != 0,\n+ JsValue::String(value) => !value.is_empty(),\n JsValue::Null => false,\n JsValue::Undefined => false,\n }\n@@ -102,7 +102,7 @@ impl<'de> Deserialize<'de> for JsValue {\n \n #[inline]\n fn visit_i64(self, value: i64) -> Result {\n- if value >= MIN_SAFE_INT && value <= MAX_SAFE_INT {\n+ if (MIN_SAFE_INT..=MAX_SAFE_INT).contains(&value) {\n Ok(JsValue::Number((value as f64).into()))\n } else {\n panic!(\"Invalid number\")\n@@ -212,11 +212,7 @@ impl Number {\n \n pub fn is_truthy(self) -> bool {\n let value = f64::from(self);\n- if self.0 == f64::NAN.to_bits() || value == 0.0 || value == -0.0 {\n- false\n- } else {\n- true\n- }\n+ !(self.0 == f64::NAN.to_bits() || value == 0.0 || value == -0.0)\n }\n }\n \ndiff --git a\/compiler\/forget\/crates\/forget_estree\/src\/lib.rs b\/compiler\/forget\/crates\/forget_estree\/src\/lib.rs\nindex 8f98f0fed5..4f5dd69f18 100644\n--- a\/compiler\/forget\/crates\/forget_estree\/src\/lib.rs\n+++ b\/compiler\/forget\/crates\/forget_estree\/src\/lib.rs\n@@ -15,7 +15,6 @@ pub use visit::*;\n #[cfg(test)]\n mod tests {\n use insta::{assert_snapshot, glob};\n- use serde_json;\n \n use super::*;\n \ndiff --git a\/compiler\/forget\/crates\/forget_estree\/src\/visit.rs b\/compiler\/forget\/crates\/forget_estree\/src\/visit.rs\nindex ebe2ac2da5..9d5c6ad7e2 100644\n--- a\/compiler\/forget\/crates\/forget_estree\/src\/visit.rs\n+++ b\/compiler\/forget\/crates\/forget_estree\/src\/visit.rs\n@@ -14,14 +14,14 @@ use crate::{\n pub trait Visitor_DEPRECATED<'ast> {\n fn visit_lvalue(&mut self, f: F)\n where\n- F: FnOnce(&mut Self) -> (),\n+ F: FnOnce(&mut Self),\n {\n f(self);\n }\n \n fn visit_rvalue(&mut self, f: F)\n where\n- F: FnOnce(&mut Self) -> (),\n+ F: FnOnce(&mut Self),\n {\n f(self);\n }\ndiff --git a\/compiler\/forget\/crates\/forget_estree_codegen\/src\/codegen.rs b\/compiler\/forget\/crates\/forget_estree_codegen\/src\/codegen.rs\nindex a4d76f69a7..233e18e94d 100644\n--- a\/compiler\/forget\/crates\/forget_estree_codegen\/src\/codegen.rs\n+++ b\/compiler\/forget\/crates\/forget_estree_codegen\/src\/codegen.rs\n@@ -92,6 +92,7 @@ impl Grammar {\n #![allow(dead_code)]\n #![allow(unused_variables)]\n #![allow(non_snake_case)]\n+ #![allow(clippy::enum_variant_names)]\n \n use std::num::NonZeroU32;\n use serde::ser::{Serializer, SerializeMap};\n@@ -137,9 +138,9 @@ impl Grammar {\n quote! {\n #![allow(dead_code)]\n #![allow(unused_variables)]\n+ #![allow(clippy::enum_variant_names)]\n \n use forget_estree::*;\n- use hermes;\n use hermes::parser::{NodePtr, NodeKind, NodeLabel };\n use hermes::utf::{utf8_with_surrogates_to_string};\n use crate::generated_extension::*;\n@@ -335,7 +336,7 @@ impl Node {\n .filter_map(|(name, field)| {\n let (type_name_str, type_kind) = parse_type(&field.type_).unwrap();\n if (!grammar.objects.contains_key(&type_name_str)\n- || grammar.objects.get(&type_name_str).unwrap().visitor == false)\n+ || !grammar.objects.get(&type_name_str).unwrap().visitor)\n && !grammar.nodes.contains_key(&type_name_str)\n && !grammar.enums.contains_key(&type_name_str)\n {\n@@ -926,7 +927,7 @@ fn parse_type(type_: &str) -> Result<(String, TypeKind), String> {\n current = ¤t[7..current.len() - 1];\n is_option = true;\n }\n- if current.contains(\"<\") {\n+ if current.contains('<') {\n Err(format!(\n \"Unsupported type `{current}` expected named type (`Identifier`), optional type (`Option`), list type (`Vec`), or optional list (`Vec>`)\"\n ))\ndiff --git a\/compiler\/forget\/crates\/forget_hermes_parser\/src\/generated.rs b\/compiler\/forget\/crates\/forget_hermes_parser\/src\/generated.rs\nindex 791be247b4..7184a359fd 100644\n--- a\/compiler\/forget\/crates\/forget_hermes_parser\/src\/generated.rs\n+++ b\/compiler\/forget\/crates\/forget_hermes_parser\/src\/generated.rs\n@@ -2,8 +2,8 @@\n #![cfg_attr(rustfmt, rustfmt_skip)]\n #![allow(dead_code)]\n #![allow(unused_variables)]\n+#![allow(clippy::enum_variant_names)]\n use forget_estree::*;\n-use hermes;\n use hermes::parser::{NodePtr, NodeKind, NodeLabel};\n use hermes::utf::utf8_with_surrogates_to_string;\n use crate::generated_extension::*;\ndiff --git a\/compiler\/forget\/crates\/forget_hermes_parser\/src\/generated_extension.rs b\/compiler\/forget\/crates\/forget_hermes_parser\/src\/generated_extension.rs\nindex 5cb3e801ff..b0ce286fd8 100644\n--- a\/compiler\/forget\/crates\/forget_hermes_parser\/src\/generated_extension.rs\n+++ b\/compiler\/forget\/crates\/forget_hermes_parser\/src\/generated_extension.rs\n@@ -19,8 +19,8 @@ use hermes::parser::{\n hermes_get_FunctionExpression_generator, hermes_get_FunctionExpression_id,\n hermes_get_FunctionExpression_params, hermes_get_Property_computed, hermes_get_Property_key,\n hermes_get_Property_kind, hermes_get_Property_method, hermes_get_Property_shorthand,\n- hermes_get_Property_value, NodeKind, NodeLabel, NodeLabelOpt, NodeListRef,\n- NodePtr, NodePtrOpt, NodeString, NodeStringOpt, SMRange,\n+ hermes_get_Property_value, NodeKind, NodeLabel, NodeLabelOpt, NodeListRef, NodePtr, NodePtrOpt,\n+ NodeString, NodeStringOpt, SMRange,\n };\n use hermes::utf::utf8_with_surrogates_to_string;\n use juno_support::NullTerminatedBuf;\n@@ -31,7 +31,7 @@ pub struct Context {\n \n impl Context {\n pub fn new(parser: &NullTerminatedBuf) -> Self {\n- let start: usize = unsafe { std::mem::transmute(parser.as_ptr()) };\n+ let start: usize = unsafe { parser.as_ptr() as usize };\n Self { start }\n }\n }\n@@ -43,11 +43,11 @@ pub trait FromHermesLabel {\n fn convert(cx: &mut Context, label: NodeLabel) -> Self;\n }\n \n-pub fn convert_option(node: NodePtrOpt, mut f: F) -> Option\n+pub fn convert_option(node: NodePtrOpt, f: F) -> Option\n where\n F: FnMut(NodePtr) -> T,\n {\n- node.as_node_ptr().map(|node| f(node))\n+ node.as_node_ptr().map(f)\n }\n \n pub fn convert_vec(node: NodeListRef, mut f: F) -> Vec\n@@ -75,9 +75,9 @@ where\n \n pub fn convert_range(cx: &Context, node: NodePtr) -> SourceRange {\n let range = node.as_ref().source_range;\n- let absolute_start: usize = unsafe { std::mem::transmute(range.start.as_ptr()) };\n+ let absolute_start: usize = range.start.as_ptr() as usize;\n let start = absolute_start - cx.start;\n- let absolute_end: usize = unsafe { std::mem::transmute(range.end.as_ptr()) };\n+ let absolute_end: usize = range.end.as_ptr() as usize;\n let end = absolute_end - cx.start;\n SourceRange {\n start: start as u32,\ndiff --git a\/compiler\/forget\/crates\/forget_hermes_parser\/src\/lib.rs b\/compiler\/forget\/crates\/forget_hermes_parser\/src\/lib.rs\nindex 62603cb072..c5efdd2473 100644\n--- a\/compiler\/forget\/crates\/forget_hermes_parser\/src\/lib.rs\n+++ b\/compiler\/forget\/crates\/forget_hermes_parser\/src\/lib.rs\n@@ -23,7 +23,7 @@ pub fn parse(source: &str, _file: &str) -> Result> {\n if result.has_errors() {\n let error_messages = result.messages();\n return Err(error_messages\n- .into_iter()\n+ .iter()\n .map(|diag| {\n let message = utf8_with_surrogates_to_string(diag.message.as_slice()).unwrap();\n Diagnostic::invalid_syntax(message, None)\ndiff --git a\/compiler\/forget\/crates\/forget_hermes_parser\/tests\/parser_test.rs b\/compiler\/forget\/crates\/forget_hermes_parser\/tests\/parser_test.rs\nindex c76b0c5de0..a094c1c62c 100644\n--- a\/compiler\/forget\/crates\/forget_hermes_parser\/tests\/parser_test.rs\n+++ b\/compiler\/forget\/crates\/forget_hermes_parser\/tests\/parser_test.rs\n@@ -3,7 +3,6 @@ use std::env;\n use forget_estree::SourceType;\n use forget_hermes_parser::parse;\n use insta::{assert_snapshot, glob};\n-use serde_json;\n \n #[test]\n fn fixtures() {\ndiff --git a\/compiler\/forget\/crates\/forget_hir\/src\/function.rs b\/compiler\/forget\/crates\/forget_hir\/src\/function.rs\nindex d8757bd69a..00ca1a8e77 100644\n--- a\/compiler\/forget\/crates\/forget_hir\/src\/function.rs\n+++ b\/compiler\/forget\/crates\/forget_hir\/src\/function.rs\n@@ -32,7 +32,7 @@ pub struct HIR {\n }\n \n impl HIR {\n- pub fn inline(&mut self, other: FunctionExpression) -> () {\n+ pub fn inline(&mut self, other: FunctionExpression) {\n let offset = self.instructions.len();\n for instr in other.lowered_function.body.instructions.into_iter() {\n self.instructions.push(instr);\n@@ -197,7 +197,7 @@ impl<'blocks> BlockRewriter<'blocks> {\n }\n }\n \n- pub fn each_block(&mut self, mut f: F) -> ()\n+ pub fn each_block(&mut self, mut f: F)\n where\n F: FnMut(Box, &mut Self) -> BlockRewriterAction,\n {\ndiff --git a\/compiler\/forget\/crates\/forget_hir\/src\/instruction.rs b\/compiler\/forget\/crates\/forget_hir\/src\/instruction.rs\nindex c1cf756fc1..d246e51ef5 100644\n--- a\/compiler\/forget\/crates\/forget_hir\/src\/instruction.rs\n+++ b\/compiler\/forget\/crates\/forget_hir\/src\/instruction.rs\n@@ -14,9 +14,9 @@ pub struct Instruction {\n }\n \n impl Instruction {\n- pub fn each_lvalue(&mut self, mut f: F) -> ()\n+ pub fn each_lvalue(&mut self, mut f: F)\n where\n- F: FnMut(&mut IdentifierOperand) -> (),\n+ F: FnMut(&mut IdentifierOperand),\n {\n match &mut self.value {\n InstructionValue::DeclareContext(instr) => {\n@@ -75,9 +75,9 @@ impl Instruction {\n Ok(())\n }\n \n- pub fn each_rvalue(&mut self, mut f: F) -> ()\n+ pub fn each_rvalue(&mut self, mut f: F)\n where\n- F: FnMut(&mut IdentifierOperand) -> (),\n+ F: FnMut(&mut IdentifierOperand),\n {\n match &mut self.value {\n InstructionValue::Array(value) => {\n@@ -303,9 +303,9 @@ impl DestructurePattern {\n }\n Ok(())\n }\n- pub fn each_operand(&mut self, f: &mut F) -> ()\n+ pub fn each_operand(&mut self, f: &mut F)\n where\n- F: FnMut(&mut IdentifierOperand) -> (),\n+ F: FnMut(&mut IdentifierOperand),\n {\n match self {\n Self::Array(elements) => {\ndiff --git a\/compiler\/forget\/crates\/forget_hir\/src\/terminal.rs b\/compiler\/forget\/crates\/forget_hir\/src\/terminal.rs\nindex 7e72e30cb9..5a13cd432f 100644\n--- a\/compiler\/forget\/crates\/forget_hir\/src\/terminal.rs\n+++ b\/compiler\/forget\/crates\/forget_hir\/src\/terminal.rs\n@@ -30,7 +30,7 @@ pub enum TerminalValue {\n }\n \n impl TerminalValue {\n- pub fn map_optional_fallthroughs(&mut self, f: F) -> ()\n+ pub fn map_optional_fallthroughs(&mut self, f: F)\n where\n F: Fn(BlockId) -> Option,\n {\n@@ -85,9 +85,9 @@ impl TerminalValue {\n }\n }\n \n- pub fn each_operand(&mut self, mut f: F) -> ()\n+ pub fn each_operand(&mut self, mut f: F)\n where\n- F: FnMut(&mut IdentifierOperand) -> (),\n+ F: FnMut(&mut IdentifierOperand),\n {\n match self {\n TerminalValue::Branch(terminal) => f(&mut terminal.test),\ndiff --git a\/compiler\/forget\/crates\/forget_optimization\/src\/constant_propagation.rs b\/compiler\/forget\/crates\/forget_optimization\/src\/constant_propagation.rs\nindex 626da203e4..946087a90d 100644\n--- a\/compiler\/forget\/crates\/forget_optimization\/src\/constant_propagation.rs\n+++ b\/compiler\/forget\/crates\/forget_optimization\/src\/constant_propagation.rs\n@@ -220,15 +220,11 @@ fn apply_binary_operator(\n _ => None,\n },\n (left, right) => match operator {\n- BinaryOperator::Equals => left\n- .loosely_equals(&right)\n- .map(|value| JsValue::Boolean(value)),\n- BinaryOperator::NotEquals => left\n- .not_loosely_equals(&right)\n- .map(|value| JsValue::Boolean(value)),\n- BinaryOperator::StrictEquals => Some(JsValue::Boolean(left.strictly_equals(&right))),\n+ BinaryOperator::Equals => left.loosely_equals(right).map(JsValue::Boolean),\n+ BinaryOperator::NotEquals => left.not_loosely_equals(right).map(JsValue::Boolean),\n+ BinaryOperator::StrictEquals => Some(JsValue::Boolean(left.strictly_equals(right))),\n BinaryOperator::NotStrictEquals => {\n- Some(JsValue::Boolean(left.not_strictly_equals(&right)))\n+ Some(JsValue::Boolean(left.not_strictly_equals(right)))\n }\n _ => None,\n },\ndiff --git a\/compiler\/forget\/crates\/forget_semantic_analysis\/src\/analyzer.rs b\/compiler\/forget\/crates\/forget_semantic_analysis\/src\/analyzer.rs\nindex c587a290f6..2b6d8742c6 100644\n--- a\/compiler\/forget\/crates\/forget_semantic_analysis\/src\/analyzer.rs\n+++ b\/compiler\/forget\/crates\/forget_semantic_analysis\/src\/analyzer.rs\n@@ -79,7 +79,7 @@ impl Analyzer {\n \n fn enter_label(&mut self, id: LabelId, mut f: F)\n where\n- F: FnMut(&mut Self) -> (),\n+ F: FnMut(&mut Self),\n {\n self.labels.push(id);\n f(self);\n@@ -127,7 +127,7 @@ impl Analyzer {\n \n fn enter(&mut self, kind: ScopeKind, mut f: F) -> ScopeId\n where\n- F: FnMut(&mut Self) -> (),\n+ F: FnMut(&mut Self),\n {\n let scope = self.enter_scope(kind);\n f(self);\ndiff --git a\/compiler\/forget\/crates\/forget_semantic_analysis\/src\/scope_view.rs b\/compiler\/forget\/crates\/forget_semantic_analysis\/src\/scope_view.rs\nindex 131ea7dc3e..69ccb1dd53 100644\n--- a\/compiler\/forget\/crates\/forget_semantic_analysis\/src\/scope_view.rs\n+++ b\/compiler\/forget\/crates\/forget_semantic_analysis\/src\/scope_view.rs\n@@ -13,7 +13,7 @@ pub struct ScopeManagerView<'m> {\n impl<'m> ScopeManagerView<'m> {\n pub fn root(&self) -> ScopeView<'m> {\n ScopeView {\n- manager: &self.manager,\n+ manager: self.manager,\n scope: self.manager.scope(self.manager.root_id()),\n }\n }\n@@ -50,7 +50,7 @@ impl<'m> ScopeView<'m> {\n self.scope.parent.map(|id| {\n let scope = self.manager.scope(id);\n ScopeView {\n- manager: &self.manager,\n+ manager: self.manager,\n scope,\n }\n })\n@@ -64,7 +64,7 @@ impl<'m> ScopeView<'m> {\n .map(|id| {\n let declaration = self.manager.declaration(id);\n DeclarationView {\n- manager: &self.manager,\n+ manager: self.manager,\n declaration,\n }\n })\n@@ -79,7 +79,7 @@ impl<'m> ScopeView<'m> {\n .map(|id| {\n let reference = self.manager.reference(id);\n ReferenceView {\n- manager: &self.manager,\n+ manager: self.manager,\n reference,\n }\n })\n@@ -94,7 +94,7 @@ impl<'m> ScopeView<'m> {\n .map(|id| {\n let scope = self.manager.scope(id);\n ScopeView {\n- manager: &self.manager,\n+ manager: self.manager,\n scope,\n }\n })\n@@ -117,7 +117,7 @@ impl<'m> std::fmt::Debug for ScopeView<'m> {\n (\n name.clone(),\n DeclarationView {\n- manager: &self.manager,\n+ manager: self.manager,\n declaration: self.manager.declaration(*declaration),\n },\n )\n@@ -128,7 +128,7 @@ impl<'m> std::fmt::Debug for ScopeView<'m> {\n .references\n .iter()\n .map(|reference| ReferenceView {\n- manager: &self.manager,\n+ manager: self.manager,\n reference: self.manager.reference(*reference),\n })\n .collect();\n@@ -137,7 +137,7 @@ impl<'m> std::fmt::Debug for ScopeView<'m> {\n .children\n .iter()\n .map(|child| ScopeView {\n- manager: &self.manager,\n+ manager: self.manager,\n scope: self.manager.scope(*child),\n })\n .collect();\n@@ -190,7 +190,7 @@ impl<'m> DeclarationView<'m> {\n pub fn scope(&self) -> ScopeView<'m> {\n let scope = self.manager.scope(self.declaration.scope);\n ScopeView {\n- manager: &self.manager,\n+ manager: self.manager,\n scope,\n }\n }\n@@ -224,7 +224,7 @@ impl<'m> ReferenceView<'m> {\n pub fn scope(&self) -> ScopeView<'m> {\n let scope = self.manager.scope(self.reference.scope);\n ScopeView {\n- manager: &self.manager,\n+ manager: self.manager,\n scope,\n }\n }\n@@ -232,7 +232,7 @@ impl<'m> ReferenceView<'m> {\n pub fn declaration(&self) -> DeclarationView<'m> {\n let declaration = self.manager.declaration(self.reference.declaration);\n DeclarationView {\n- manager: &self.manager,\n+ manager: self.manager,\n declaration,\n }\n }\ndiff --git a\/compiler\/forget\/crates\/forget_ssa\/src\/enter.rs b\/compiler\/forget\/crates\/forget_ssa\/src\/enter.rs\nindex 82050b0c52..94866ac271 100644\n--- a\/compiler\/forget\/crates\/forget_ssa\/src\/enter.rs\n+++ b\/compiler\/forget\/crates\/forget_ssa\/src\/enter.rs\n@@ -38,9 +38,9 @@ pub fn enter_ssa_impl(\n Ok(())\n }\n \n-fn visit_instructions<'e>(\n+fn visit_instructions(\n env: &Environment,\n- builder: &mut Builder<'e>,\n+ builder: &mut Builder<'_>,\n hir: &mut HIR,\n ) -> Result<(), Diagnostic> {\n let instructions = &mut hir.instructions;\n@@ -175,7 +175,7 @@ impl<'e> Builder<'e> {\n Ok(())\n }\n \n- fn visit_param(&mut self, param: &mut IdentifierOperand) -> () {\n+ fn visit_param(&mut self, param: &mut IdentifierOperand) {\n let old_identifier = ¶m.identifier;\n let new_identifier = self.make_identifier(old_identifier);\n let state = self.states.get_mut(&self.current).unwrap();\n@@ -183,7 +183,7 @@ impl<'e> Builder<'e> {\n param.identifier = new_identifier;\n }\n \n- fn visit_load(&mut self, local: &mut IdentifierOperand) -> () {\n+ fn visit_load(&mut self, local: &mut IdentifierOperand) {\n let new_identifier = self.get_id_at(self.current, &local.identifier);\n local.identifier = new_identifier;\n }\n@@ -262,7 +262,7 @@ impl<'e> Builder<'e> {\n }\n }\n \n- fn fix_incomplete_phis(&mut self, block_id: BlockId) -> () {\n+ fn fix_incomplete_phis(&mut self, block_id: BlockId) {\n let state = self.states.get_mut(&block_id).unwrap();\n let incomplete_phis = std::mem::take(&mut state.incomplete_phis);\n for phi in incomplete_phis {\n","commit":{"revision":"d5a8e801571fbada273171e646d6b50d4cd81992","authorEmail":"joesavona@fb.com","authoredAt":"2023-08-17T12:59:29-07:00","authorName":"Joe Savona","shortRevision":"d5a8e80157","subject":"[rust][ci] Run cargo check\/fmt"},"parents":["5b6370234c1dd34f1e95aefe0bf023f29a5f7083"]}

dillon1000/react

Files changed