Skip to content

Commit

Permalink
refactor(plugin/runner): Fix clippy warnings (#7244)
Browse files Browse the repository at this point in the history
  • Loading branch information
kdy1 committed Apr 11, 2023
1 parent 80e125a commit 70b86db
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 21 deletions.
21 changes: 9 additions & 12 deletions crates/swc_plugin_runner/src/imported_fn/comments.rs
Expand Up @@ -113,10 +113,7 @@ where
.as_ref()
.expect("Alloc guest memory fn should be available, check initialization");

return unwrap_comments_storage_or_default(
|comments| f(comments, memory, alloc_guest_memory),
default,
);
unwrap_comments_storage_or_default(|comments| f(comments, memory, alloc_guest_memory), default)
}

/// Common logics for add_*_comment/comments.
Expand Down Expand Up @@ -190,7 +187,7 @@ pub fn take_leading_comments_proxy(
.as_ref()
.expect("Alloc guest memory fn should be available, check initialization");

return unwrap_comments_storage_or_default(
unwrap_comments_storage_or_default(
|comments| {
let leading_comments = comments.take_leading(BytePos(byte_pos));
if let Some(leading_comments) = leading_comments {
Expand All @@ -211,7 +208,7 @@ pub fn take_leading_comments_proxy(
}
},
0,
);
)
}

/// Ask to get leading_comments from currently scoped comments held by
Expand All @@ -235,7 +232,7 @@ pub fn get_leading_comments_proxy(
.as_ref()
.expect("Alloc guest memory fn should be available, check initialization");

return unwrap_comments_storage_or_default(
unwrap_comments_storage_or_default(
|comments| {
let leading_comments = comments.get_leading(BytePos(byte_pos));
if let Some(leading_comments) = leading_comments {
Expand All @@ -256,7 +253,7 @@ pub fn get_leading_comments_proxy(
}
},
0,
);
)
}

#[tracing::instrument(level = "info", skip_all)]
Expand Down Expand Up @@ -314,7 +311,7 @@ pub fn take_trailing_comments_proxy(
.as_ref()
.expect("Alloc guest memory fn should be available, check initialization");

return unwrap_comments_storage_or_default(
unwrap_comments_storage_or_default(
|comments| {
let trailing_comments = comments.take_trailing(BytePos(byte_pos));
if let Some(leading_comments) = trailing_comments {
Expand All @@ -335,7 +332,7 @@ pub fn take_trailing_comments_proxy(
}
},
0,
);
)
}

#[tracing::instrument(level = "info", skip_all)]
Expand All @@ -354,7 +351,7 @@ pub fn get_trailing_comments_proxy(
.as_ref()
.expect("Alloc guest memory fn should be available, check initialization");

return unwrap_comments_storage_or_default(
unwrap_comments_storage_or_default(
|comments| {
let trailing_comments = comments.get_trailing(BytePos(byte_pos));
if let Some(leading_comments) = trailing_comments {
Expand All @@ -375,7 +372,7 @@ pub fn get_trailing_comments_proxy(
}
},
0,
);
)
}

#[tracing::instrument(level = "info", skip_all)]
Expand Down
6 changes: 3 additions & 3 deletions crates/swc_plugin_runner/src/imported_fn/metadata_context.rs
Expand Up @@ -90,7 +90,7 @@ pub fn get_transform_plugin_config(
return 1;
}
}
return 0;
0
}

#[tracing::instrument(level = "info", skip_all)]
Expand Down Expand Up @@ -128,7 +128,7 @@ pub fn get_transform_context(

return 1;
}
return 0;
0
}

#[tracing::instrument(level = "info", skip_all)]
Expand Down Expand Up @@ -173,7 +173,7 @@ pub fn get_experimental_transform_context(
return 1;
}

return 0;
0
}

#[tracing::instrument(level = "info", skip_all)]
Expand Down
4 changes: 2 additions & 2 deletions crates/swc_plugin_runner/src/memory_interop.rs
Expand Up @@ -5,7 +5,7 @@ use wasmer::{Memory, MemoryView, StoreMut, TypedFunction, WasmPtr};
#[tracing::instrument(level = "info", skip_all)]
pub fn copy_bytes_into_host(memory: &MemoryView, bytes_ptr: i32, bytes_ptr_len: i32) -> Vec<u8> {
let ptr: WasmPtr<u8> = WasmPtr::new(bytes_ptr as _);
let derefed_ptr = ptr.deref(memory);
let _derefed_ptr = ptr.deref(memory);
let values = ptr.slice(memory, bytes_ptr_len as u32).expect("xxx");

values
Expand Down Expand Up @@ -75,7 +75,7 @@ pub fn allocate_return_values_into_guest(
.expect("Should able to allocate memory in the plugin");

let (allocated_ptr, allocated_ptr_len) =
write_into_memory_view(memory, store, serialized_bytes, |s, _| guest_memory_ptr);
write_into_memory_view(memory, store, serialized_bytes, |_, _| guest_memory_ptr);

let allocated_bytes = AllocatedBytesPtr(allocated_ptr, allocated_ptr_len);
// Retuning (allocated_ptr, len) into caller (plugin)
Expand Down
7 changes: 3 additions & 4 deletions crates/swc_plugin_runner/src/transform_executor.rs
Expand Up @@ -128,13 +128,12 @@ impl TransformExecutor {
|s, serialized_len| {
self.exported_plugin_alloc
.call(s, serialized_len.try_into().expect("booo"))
.expect(
format!(
.unwrap_or_else(|_| {
panic!(
"Should able to allocate memory for the size of {}",
serialized_len
)
.as_str(),
)
})
},
);

Expand Down

1 comment on commit 70b86db

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: 70b86db Previous: 6614886 Ratio
es/full/bugs-1 308127 ns/iter (± 9964) 318761 ns/iter (± 10108) 0.97
es/full/minify/libraries/antd 1531947464 ns/iter (± 15098373) 1540535456 ns/iter (± 19489631) 0.99
es/full/minify/libraries/d3 294276857 ns/iter (± 10037944) 303248018 ns/iter (± 5263571) 0.97
es/full/minify/libraries/echarts 1191198445 ns/iter (± 8485209) 1200152673 ns/iter (± 17577650) 0.99
es/full/minify/libraries/jquery 89727161 ns/iter (± 964097) 90883449 ns/iter (± 1218443) 0.99
es/full/minify/libraries/lodash 104884104 ns/iter (± 803683) 105791052 ns/iter (± 1383415) 0.99
es/full/minify/libraries/moment 51733906 ns/iter (± 294250) 52647009 ns/iter (± 613407) 0.98
es/full/minify/libraries/react 18843747 ns/iter (± 132602) 19201783 ns/iter (± 262000) 0.98
es/full/minify/libraries/terser 243400755 ns/iter (± 3082680) 245826459 ns/iter (± 3029288) 0.99
es/full/minify/libraries/three 426932079 ns/iter (± 6451055) 446248919 ns/iter (± 8469340) 0.96
es/full/minify/libraries/typescript 2918643204 ns/iter (± 19927385) 2904751083 ns/iter (± 14828970) 1.00
es/full/minify/libraries/victory 646452844 ns/iter (± 9007056) 657328400 ns/iter (± 14513358) 0.98
es/full/minify/libraries/vue 128879490 ns/iter (± 983811) 128735397 ns/iter (± 1332115) 1.00
es/full/codegen/es3 28970 ns/iter (± 40) 28687 ns/iter (± 44) 1.01
es/full/codegen/es5 29027 ns/iter (± 63) 28746 ns/iter (± 52) 1.01
es/full/codegen/es2015 29022 ns/iter (± 92) 28766 ns/iter (± 54) 1.01
es/full/codegen/es2016 28955 ns/iter (± 88) 28819 ns/iter (± 48) 1.00
es/full/codegen/es2017 28955 ns/iter (± 82) 28819 ns/iter (± 75) 1.00
es/full/codegen/es2018 29025 ns/iter (± 59) 28796 ns/iter (± 64) 1.01
es/full/codegen/es2019 29009 ns/iter (± 56) 28762 ns/iter (± 41) 1.01
es/full/codegen/es2020 28971 ns/iter (± 60) 28745 ns/iter (± 61) 1.01
es/full/all/es3 179608009 ns/iter (± 3595818) 183437772 ns/iter (± 3220962) 0.98
es/full/all/es5 170061636 ns/iter (± 2190598) 173658622 ns/iter (± 2729690) 0.98
es/full/all/es2015 131762487 ns/iter (± 2517929) 138215138 ns/iter (± 2232225) 0.95
es/full/all/es2016 130748155 ns/iter (± 946699) 136728591 ns/iter (± 2473161) 0.96
es/full/all/es2017 128666536 ns/iter (± 1712091) 136008978 ns/iter (± 1746757) 0.95
es/full/all/es2018 123860624 ns/iter (± 2371671) 132256693 ns/iter (± 2736929) 0.94
es/full/all/es2019 122628770 ns/iter (± 1199224) 129481985 ns/iter (± 2862417) 0.95
es/full/all/es2020 116544551 ns/iter (± 622147) 121559695 ns/iter (± 2443914) 0.96
es/full/parser 510805 ns/iter (± 7235) 519713 ns/iter (± 6665) 0.98
es/full/base/fixer 22660 ns/iter (± 57) 22975 ns/iter (± 31) 0.99
es/full/base/resolver_and_hygiene 83867 ns/iter (± 124) 87298 ns/iter (± 388) 0.96
serialization of serde 120 ns/iter (± 0) 120 ns/iter (± 0) 1
css/minify/libraries/bootstrap 27149141 ns/iter (± 68533) 27403922 ns/iter (± 172175) 0.99
css/visitor/compare/clone 2136430 ns/iter (± 6618) 2125950 ns/iter (± 10613) 1.00
css/visitor/compare/visit_mut_span 2324215 ns/iter (± 13715) 2320011 ns/iter (± 5669) 1.00
css/visitor/compare/visit_mut_span_panic 2381531 ns/iter (± 6324) 2359653 ns/iter (± 4337) 1.01
css/visitor/compare/fold_span 3088909 ns/iter (± 20079) 3090593 ns/iter (± 13871) 1.00
css/visitor/compare/fold_span_panic 3236159 ns/iter (± 11738) 3240693 ns/iter (± 18263) 1.00
css/lexer/bootstrap_5_1_3 5103838 ns/iter (± 42508) 5120287 ns/iter (± 5710) 1.00
css/lexer/foundation_6_7_4 4289973 ns/iter (± 1848) 4322057 ns/iter (± 968) 0.99
css/lexer/tailwind_3_1_1 815355 ns/iter (± 1871) 819325 ns/iter (± 238) 1.00
css/parser/bootstrap_5_1_3 21276760 ns/iter (± 134956) 21016435 ns/iter (± 39976) 1.01
css/parser/foundation_6_7_4 16824427 ns/iter (± 47949) 16776957 ns/iter (± 47684) 1.00
css/parser/tailwind_3_1_1 3243932 ns/iter (± 4228) 3238295 ns/iter (± 1981) 1.00
es/codegen/colors 327323 ns/iter (± 185011) 326138 ns/iter (± 184574) 1.00
es/codegen/large 1245461 ns/iter (± 641034) 1273638 ns/iter (± 659315) 0.98
es/codegen/with-parser/colors 47565 ns/iter (± 310) 47406 ns/iter (± 320) 1.00
es/codegen/with-parser/large 510561 ns/iter (± 1223) 516292 ns/iter (± 978) 0.99
es/minify/libraries/antd 1339372663 ns/iter (± 14752601) 1357794145 ns/iter (± 25557821) 0.99
es/minify/libraries/d3 247756344 ns/iter (± 2494576) 253544134 ns/iter (± 4014358) 0.98
es/minify/libraries/echarts 1022489514 ns/iter (± 12309191) 1045352703 ns/iter (± 12576466) 0.98
es/minify/libraries/jquery 78004666 ns/iter (± 540933) 79036411 ns/iter (± 1549596) 0.99
es/minify/libraries/lodash 93476994 ns/iter (± 684887) 95393996 ns/iter (± 2048208) 0.98
es/minify/libraries/moment 45147206 ns/iter (± 451130) 45907089 ns/iter (± 567045) 0.98
es/minify/libraries/react 16851257 ns/iter (± 126913) 17290164 ns/iter (± 202946) 0.97
es/minify/libraries/terser 206141487 ns/iter (± 2879894) 210138879 ns/iter (± 3826309) 0.98
es/minify/libraries/three 347422648 ns/iter (± 3845231) 361979261 ns/iter (± 6623358) 0.96
es/minify/libraries/typescript 2484216438 ns/iter (± 19109960) 2472570770 ns/iter (± 12244433) 1.00
es/minify/libraries/victory 551901927 ns/iter (± 30010586) 563215044 ns/iter (± 9468647) 0.98
es/minify/libraries/vue 114418740 ns/iter (± 999883) 117522469 ns/iter (± 1411875) 0.97
es/visitor/compare/clone 2317316 ns/iter (± 13891) 2318495 ns/iter (± 9462) 1.00
es/visitor/compare/visit_mut_span 2689065 ns/iter (± 36701) 2683595 ns/iter (± 20922) 1.00
es/visitor/compare/visit_mut_span_panic 2738542 ns/iter (± 2952) 2735370 ns/iter (± 6066) 1.00
es/visitor/compare/fold_span 3782432 ns/iter (± 5945) 3799477 ns/iter (± 6911) 1.00
es/visitor/compare/fold_span_panic 3907029 ns/iter (± 9343) 3938554 ns/iter (± 5854) 0.99
es/lexer/colors 13008 ns/iter (± 6) 13107 ns/iter (± 12) 0.99
es/lexer/angular 6344234 ns/iter (± 2760) 6383535 ns/iter (± 8768) 0.99
es/lexer/backbone 786892 ns/iter (± 337) 788908 ns/iter (± 5213) 1.00
es/lexer/jquery 4379726 ns/iter (± 4584) 4412595 ns/iter (± 3294) 0.99
es/lexer/jquery mobile 6864150 ns/iter (± 4154) 6898193 ns/iter (± 5754) 1.00
es/lexer/mootools 3442039 ns/iter (± 2306) 3461816 ns/iter (± 3146) 0.99
es/lexer/underscore 646351 ns/iter (± 619) 649772 ns/iter (± 375) 0.99
es/lexer/three 20896183 ns/iter (± 29276) 20824025 ns/iter (± 16736) 1.00
es/lexer/yui 3861229 ns/iter (± 1406) 3862512 ns/iter (± 2596) 1.00
es/parser/colors 29441 ns/iter (± 56) 29345 ns/iter (± 80) 1.00
es/parser/angular 15035068 ns/iter (± 105921) 15264533 ns/iter (± 178132) 0.98
es/parser/backbone 2188437 ns/iter (± 15310) 2170485 ns/iter (± 13338) 1.01
es/parser/jquery 11768350 ns/iter (± 96969) 11793177 ns/iter (± 109992) 1.00
es/parser/jquery mobile 18367820 ns/iter (± 146573) 18343768 ns/iter (± 169759) 1.00
es/parser/mootools 9026520 ns/iter (± 21279) 8995344 ns/iter (± 24756) 1.00
es/parser/underscore 1841338 ns/iter (± 10656) 1831198 ns/iter (± 9836) 1.01
es/parser/three 53670629 ns/iter (± 516269) 53615139 ns/iter (± 670682) 1.00
es/parser/yui 9125297 ns/iter (± 46921) 9016924 ns/iter (± 39468) 1.01
es/preset-env/usage/builtin_type 144300 ns/iter (± 34355) 143822 ns/iter (± 33833) 1.00
es/preset-env/usage/property 21145 ns/iter (± 187) 21128 ns/iter (± 102) 1.00
es/resolver/typescript 113190316 ns/iter (± 2135327) 115073624 ns/iter (± 4143878) 0.98
es/fixer/typescript 81207899 ns/iter (± 1562549) 81072585 ns/iter (± 1240885) 1.00
es/hygiene/typescript 168378622 ns/iter (± 860052) 169817979 ns/iter (± 1840552) 0.99
es/resolver_with_hygiene/typescript 304098149 ns/iter (± 2492615) 301348666 ns/iter (± 2875570) 1.01
es/visitor/base-perf/module_clone 80438 ns/iter (± 520) 80913 ns/iter (± 274) 0.99
es/visitor/base-perf/fold_empty 90825 ns/iter (± 365) 90970 ns/iter (± 348) 1.00
es/visitor/base-perf/fold_noop_impl_all 90905 ns/iter (± 310) 91145 ns/iter (± 432) 1.00
es/visitor/base-perf/fold_noop_impl_vec 91040 ns/iter (± 533) 91058 ns/iter (± 697) 1.00
es/visitor/base-perf/boxing_boxed_clone 56 ns/iter (± 0) 56 ns/iter (± 0) 1
es/visitor/base-perf/boxing_unboxed_clone 41 ns/iter (± 0) 42 ns/iter (± 0) 0.98
es/visitor/base-perf/boxing_boxed 102 ns/iter (± 0) 102 ns/iter (± 0) 1
es/visitor/base-perf/boxing_unboxed 78 ns/iter (± 0) 79 ns/iter (± 0) 0.99
es/visitor/base-perf/visit_contains_this 3500 ns/iter (± 92) 3485 ns/iter (± 60) 1.00
es/base/parallel/resolver/typescript 6100661718 ns/iter (± 421020112) 5923342132 ns/iter (± 331699496) 1.03
es/base/parallel/hygiene/typescript 2003579054 ns/iter (± 18729547) 2023302488 ns/iter (± 30496383) 0.99
misc/visitors/time-complexity/time 5 99 ns/iter (± 0) 109 ns/iter (± 0) 0.91
misc/visitors/time-complexity/time 10 334 ns/iter (± 4) 356 ns/iter (± 0) 0.94
misc/visitors/time-complexity/time 15 650 ns/iter (± 0) 691 ns/iter (± 8) 0.94
misc/visitors/time-complexity/time 20 1250 ns/iter (± 1) 1270 ns/iter (± 5) 0.98
misc/visitors/time-complexity/time 40 6594 ns/iter (± 65) 6798 ns/iter (± 45) 0.97
misc/visitors/time-complexity/time 60 17037 ns/iter (± 166) 17290 ns/iter (± 124) 0.99
es/full-target/es2016 253337 ns/iter (± 513) 253563 ns/iter (± 3813) 1.00
es/full-target/es2017 246397 ns/iter (± 429) 246813 ns/iter (± 344) 1.00
es/full-target/es2018 235161 ns/iter (± 369) 235957 ns/iter (± 424) 1.00
es2020_nullish_coalescing 93179 ns/iter (± 453) 92535 ns/iter (± 275) 1.01
es2020_optional_chaining 124828 ns/iter (± 330) 124632 ns/iter (± 287) 1.00
es2022_class_properties 149111 ns/iter (± 327) 149793 ns/iter (± 350) 1.00
es2018_object_rest_spread 95894 ns/iter (± 181) 96203 ns/iter (± 294) 1.00
es2019_optional_catch_binding 85280 ns/iter (± 172) 85294 ns/iter (± 109) 1.00
es2017_async_to_generator 85715 ns/iter (± 320) 85874 ns/iter (± 334) 1.00
es2016_exponentiation 90249 ns/iter (± 307) 89799 ns/iter (± 249) 1.01
es2015_arrow 94179 ns/iter (± 320) 94331 ns/iter (± 178) 1.00
es2015_block_scoped_fn 92135 ns/iter (± 126) 91873 ns/iter (± 181) 1.00
es2015_block_scoping 170138 ns/iter (± 302) 170091 ns/iter (± 382) 1.00

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.