From f08b9dafcccbc1f61ef7046641dfabaf9440c4f7 Mon Sep 17 00:00:00 2001 From: Cong-Cong Date: Mon, 23 Sep 2024 16:32:44 +0800 Subject: [PATCH] fix: cargo lint --- crates/node_binding/binding.d.ts | 4 +-- .../src/context_module_factory.rs | 2 +- .../rspack_binding_values/src/dependency.rs | 27 ++++++++----------- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/crates/node_binding/binding.d.ts b/crates/node_binding/binding.d.ts index 244d776acb5..8bd45de4f6c 100644 --- a/crates/node_binding/binding.d.ts +++ b/crates/node_binding/binding.d.ts @@ -149,8 +149,8 @@ export class JsDependency { get type(): string get category(): string get request(): string | undefined - get critical(): boolean | undefined - set critical(val?: boolean | undefined | null) + get critical(): boolean + set critical(val: boolean) } export class JsEntries { diff --git a/crates/rspack_binding_values/src/context_module_factory.rs b/crates/rspack_binding_values/src/context_module_factory.rs index 3f980798ce0..9951ff2add3 100644 --- a/crates/rspack_binding_values/src/context_module_factory.rs +++ b/crates/rspack_binding_values/src/context_module_factory.rs @@ -180,7 +180,7 @@ impl JsContextModuleFactoryAfterResolveData { .0 .dependencies .iter_mut() - .map(|dep| JsDependency::new(dep)) + .map(JsDependency::new) .collect::>() } } diff --git a/crates/rspack_binding_values/src/dependency.rs b/crates/rspack_binding_values/src/dependency.rs index 97c62d0a3ca..0c61abd2a27 100644 --- a/crates/rspack_binding_values/src/dependency.rs +++ b/crates/rspack_binding_values/src/dependency.rs @@ -21,7 +21,7 @@ impl JsCompiledDependency { } } - fn dependency<'a>(&self) -> &dyn Dependency { + fn dependency(&self) -> &dyn Dependency { self .module_graph .dependency_by_id(&self.dependency_id) @@ -29,11 +29,11 @@ impl JsCompiledDependency { .as_ref() } - fn module_dependency<'a>(&self) -> Option<&dyn ModuleDependency> { + fn module_dependency(&self) -> Option<&dyn ModuleDependency> { self.dependency().as_module_dependency() } - fn context_dependency<'a>(&self) -> Option<&dyn ContextDependency> { + fn context_dependency(&self) -> Option<&dyn ContextDependency> { self.dependency().as_context_dependency() } } @@ -105,24 +105,19 @@ impl JsDependency { } #[napi(getter)] - pub fn critical(&self) -> napi::Either { + pub fn critical(&self) -> bool { match self.0.as_context_dependency() { - Some(dep) => napi::Either::A(dep.critical().is_some()), - None => napi::Either::B(()), + Some(dep) => dep.critical().is_some(), + None => false, } } #[napi(setter)] - pub fn set_critical(&mut self, val: Option) { - if let Some(val) = val { - match self.0.as_context_dependency_mut() { - Some(dep) => { - let critical = dep.critical_mut(); - if !val { - *critical = None; - } - } - None => (), + pub fn set_critical(&mut self, val: bool) { + if let Some(dep) = self.0.as_context_dependency_mut() { + let critical = dep.critical_mut(); + if !val { + *critical = None; } } }