diff --git a/.github/workflows/lint-code.yml b/.github/workflows/lint-code.yml index f79a4445d..532482938 100644 --- a/.github/workflows/lint-code.yml +++ b/.github/workflows/lint-code.yml @@ -38,6 +38,8 @@ jobs: - name: Check formatting run: npm run format:check - name: Check Rust formatting - run: cd instrumentation-wasm && cargo fmt --check + run: cargo fmt --check + working-directory: ./instrumentation-wasm - name: Run Rust Linter - run: cd instrumentation-wasm && cargo clippy + run: cargo clippy -- -D warnings + working-directory: ./instrumentation-wasm diff --git a/instrumentation-wasm/Cargo.lock b/instrumentation-wasm/Cargo.lock index 98d2b3d89..eff17e919 100644 --- a/instrumentation-wasm/Cargo.lock +++ b/instrumentation-wasm/Cargo.lock @@ -94,9 +94,9 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "hashbrown" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ "allocator-api2", ] @@ -198,9 +198,9 @@ checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" [[package]] name = "oxc-miette" -version = "2.5.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c42cefdcbebec6b0b72229ac0e02261a6770cb7ba39ccc5475a856164066db1" +checksum = "f02105a875f3751a0b44b4c822b01177728dd9049ae6fb419e9b04887d730ed1" dependencies = [ "cfg-if", "owo-colors", @@ -213,9 +213,9 @@ dependencies = [ [[package]] name = "oxc-miette-derive" -version = "2.5.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05bbaa5b6b98826bb62b164406f703bee72c5287af9986f9c863fa8ea992b476" +checksum = "003b4612827f6501183873fb0735da92157e3c7daa71c40921c7d2758fec2229" dependencies = [ "proc-macro2", "quote", @@ -224,9 +224,9 @@ dependencies = [ [[package]] name = "oxc_allocator" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ef2dba21be1ce515378b2b7143eaa2a912f9e6ffe162ae20639d56f53d60e3" +checksum = "f8fbc3ece85f3523598a8560369ccc30a970f338b6fd651f5151c8431ec2edb3" dependencies = [ "allocator-api2", "bumpalo", @@ -237,9 +237,9 @@ dependencies = [ [[package]] name = "oxc_ast" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad9195311a1961bb6ef1de0ce6a52147bccea50b5a40423b7b44e8448ed4fc" +checksum = "11784bdab9500aafbad254c0e104b019e611b091c69992be9e27026c6a79134c" dependencies = [ "bitflags", "oxc_allocator", @@ -254,9 +254,9 @@ dependencies = [ [[package]] name = "oxc_ast_macros" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f03da6fac191c0817a32ae1a7dde27fd27d98732c61fcaeb55a99a4d543ba49" +checksum = "ac4d631c1c0c184f94fd83132e9e34ee8c67230dc40408d53fa0a2bfd479cefd" dependencies = [ "phf", "proc-macro2", @@ -266,9 +266,9 @@ dependencies = [ [[package]] name = "oxc_ast_visit" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42fcdb162d247a0e9c1aa985b388f000eba19fb1ee1845b2ec0ddc595f95131" +checksum = "5e7f1f0eb06cabbb6e76653bf27247149f2a612f4584363fdc16deaa26118ecf" dependencies = [ "oxc_allocator", "oxc_ast", @@ -278,9 +278,9 @@ dependencies = [ [[package]] name = "oxc_codegen" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c9a53ca79c87846e4f2b4f3df514b0b2bf910a1ba76a9e8cb742570b8b47ce" +checksum = "a757cafe831400d3ea4c68d5294c70227f0df5e2c042909759c83915e091ad26" dependencies = [ "bitflags", "cow-utils", @@ -299,15 +299,15 @@ dependencies = [ [[package]] name = "oxc_data_structures" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f5171d7b8bc907a1b29e557d14f8478509a2154272d56db9ee8aed6bfe8dec" +checksum = "d6313706dfe9442ca66d116e33cb9dd10a2e849f50c02b2ceeeee0054314faa8" [[package]] name = "oxc_diagnostics" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ef2bf6a713fd27bc65812d695bdfde3f8fcef735f00b861258518346642721b" +checksum = "d11c355f743e15dbe89d8904ed62de912a27c65190efa17cea589098aded5cf2" dependencies = [ "cow-utils", "oxc-miette", @@ -316,9 +316,9 @@ dependencies = [ [[package]] name = "oxc_ecmascript" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f908100cb2759dd2f42ca33d95ea158b8d78e2591b577757729fc9a4a4c63bc3" +checksum = "b93d021e8372fe98815f1dca0624a875286e5560b559ef113190ca1af499222e" dependencies = [ "cow-utils", "num-bigint", @@ -331,9 +331,9 @@ dependencies = [ [[package]] name = "oxc_estree" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5644d3399116ff3f0cfb81f9a790c4b8173b504ed52274ecc757b57f30098ad1" +checksum = "a10a5fec27ce5fac791761d28f984f769386faaf35076876d77fed7dd662450a" [[package]] name = "oxc_index" @@ -347,9 +347,9 @@ dependencies = [ [[package]] name = "oxc_parser" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e080498b7a4456a63111f9c65b4dd1b98147955347854b809b6ad4cc5d6a0c0a" +checksum = "1087bb997a4d5228e8777856352c2fa79a959437ca67b7ad6b3d5de35f63a8bb" dependencies = [ "bitflags", "cow-utils", @@ -370,9 +370,9 @@ dependencies = [ [[package]] name = "oxc_regular_expression" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb87ab0b072e1e97d8101cb1678204bc3873d84f13255ae5aa088f1b85f7a8e1" +checksum = "0de14dca3a84bf8b7c1ab8fa16f9b1c24238e9b8db8b9236e472ae26951d4bb7" dependencies = [ "bitflags", "oxc_allocator", @@ -386,9 +386,9 @@ dependencies = [ [[package]] name = "oxc_semantic" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56958658ca1f9f5f050dc4317821255d2ca132763b6fbee9227e45ef79ed173" +checksum = "e173291ccda0802d646b2aa3507ef5f90e8884602dc88d59ff11fcf8a14d2551" dependencies = [ "itertools", "oxc_allocator", @@ -407,9 +407,9 @@ dependencies = [ [[package]] name = "oxc_sourcemap" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd56ed0ec53da593c43d9ea65ced157fe319e454888eb65b239a275e3696499" +checksum = "36801dbbd025f2fa133367494e38eef75a53d334ae6746ba0c889fc4e76fa3a3" dependencies = [ "base64-simd", "json-escape-simd", @@ -420,9 +420,9 @@ dependencies = [ [[package]] name = "oxc_span" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41422232cfd9915d31dbb76ba2e5ae212884cad232e37203bdcb15bd1466951d" +checksum = "33999cc6b1d19d61a057abd956563e9d2189fd33aafa05e3ff110bebf119e938" dependencies = [ "compact_str", "oxc-miette", @@ -433,9 +433,9 @@ dependencies = [ [[package]] name = "oxc_syntax" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea81736f2343df141c7d8de78a91d155be4f712dfa6cd1bdd9a8b4f0676f01f" +checksum = "7d1fa373e38de4ac887cbe0ab62653402aff4388cdd642943432f2ed512f4c45" dependencies = [ "bitflags", "cow-utils", @@ -453,9 +453,9 @@ dependencies = [ [[package]] name = "oxc_traverse" -version = "0.96.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcbcda1412b43a921856314e2984cb9282f0d23c1439ae21bd5879110e01681" +checksum = "31ccfdaa5ad0049e59aed75aba01cfff242ae69067fb73e9891294ca93bdde5a" dependencies = [ "itoa", "oxc_allocator", @@ -529,9 +529,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.41" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] @@ -629,9 +629,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "2.0.108" +version = "2.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" dependencies = [ "proc-macro2", "quote", @@ -707,9 +707,9 @@ checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" [[package]] name = "wasm-bindgen" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" dependencies = [ "cfg-if", "once_cell", @@ -720,9 +720,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -730,9 +730,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" dependencies = [ "bumpalo", "proc-macro2", @@ -743,9 +743,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" dependencies = [ "unicode-ident", ] diff --git a/instrumentation-wasm/Cargo.toml b/instrumentation-wasm/Cargo.toml index 71eb906b5..14d41b2a1 100644 --- a/instrumentation-wasm/Cargo.toml +++ b/instrumentation-wasm/Cargo.toml @@ -10,13 +10,13 @@ name = "node_code_instrumentation" crate-type = ["cdylib", "rlib"] [dependencies] -oxc_allocator = "0.96.0" -oxc_ast = "0.96.0" -oxc_codegen = "0.96.0" -oxc_parser = "0.96.0" -oxc_semantic = "0.96.0" -oxc_span = "0.96.0" -oxc_traverse = "0.96.0" +oxc_allocator = "0.102.0" +oxc_ast = "0.102.0" +oxc_codegen = "0.102.0" +oxc_parser = "0.102.0" +oxc_semantic = "0.102.0" +oxc_span = "0.102.0" +oxc_traverse = "0.102.0" serde = "1.0.228" serde_json = "1.0.145" wasm-bindgen = "0.2.105" diff --git a/instrumentation-wasm/src/js_transformer/helpers/transform_return_statements.rs b/instrumentation-wasm/src/js_transformer/helpers/transform_return_statements.rs index e75588a82..5be5df94b 100644 --- a/instrumentation-wasm/src/js_transformer/helpers/transform_return_statements.rs +++ b/instrumentation-wasm/src/js_transformer/helpers/transform_return_statements.rs @@ -52,10 +52,7 @@ fn transform_statement<'a>( .take() .unwrap_or_else(|| builder.expression_identifier(SPAN, "undefined")); - let needs_await = match arg_expr { - Expression::AwaitExpression(_) => true, - _ => false, - }; + let needs_await = matches!(arg_expr, Expression::AwaitExpression(_)); instrument_args.push(arg_expr.into()); diff --git a/instrumentation-wasm/src/js_transformer/transformer_impl.rs b/instrumentation-wasm/src/js_transformer/transformer_impl.rs index 3e7a37b7d..f99150d31 100644 --- a/instrumentation-wasm/src/js_transformer/transformer_impl.rs +++ b/instrumentation-wasm/src/js_transformer/transformer_impl.rs @@ -111,7 +111,7 @@ impl<'a> Traverse<'a, TraverseState> for Transformer<'a> { // We need to collect the arg names before we make the body mutable let arg_names = if instruction.modify_args { - get_function_or_method_arg_names(&function_args) + get_function_or_method_arg_names(function_args) } else { Vec::new() }; @@ -194,7 +194,7 @@ impl<'a> Traverse<'a, TraverseState> for Transformer<'a> { node: &mut oxc_ast::ast::VariableDeclarator<'a>, _ctx: &mut TraverseCtx<'a, TraverseState>, ) { - if !node.id.kind.is_binding_identifier() || !node.init.is_some() { + if !node.id.kind.is_binding_identifier() || node.init.is_none() { return; } @@ -226,7 +226,7 @@ impl<'a> Traverse<'a, TraverseState> for Transformer<'a> { // We need to collect the arg names before we make the body mutable let arg_names = if instruction.modify_args { - get_function_or_method_arg_names(&function_args) + get_function_or_method_arg_names(function_args) } else { Vec::new() };