diff --git a/crates/oxc_linter/src/rules/eslint/no_cond_assign.rs b/crates/oxc_linter/src/rules/eslint/no_cond_assign.rs index feb8fc8e0f514..614939fc46bee 100644 --- a/crates/oxc_linter/src/rules/eslint/no_cond_assign.rs +++ b/crates/oxc_linter/src/rules/eslint/no_cond_assign.rs @@ -73,9 +73,7 @@ declare_oxc_lint!( impl Rule for NoCondAssign { fn from_configuration(value: serde_json::Value) -> Result { - Ok(serde_json::from_value::>(value) - .unwrap_or_default() - .into_inner()) + serde_json::from_value::>(value).map(DefaultRuleConfig::into_inner) } fn run<'a>(&self, node: &AstNode<'a>, ctx: &LintContext<'a>) { diff --git a/crates/oxc_linter/src/rules/eslint/unicode_bom.rs b/crates/oxc_linter/src/rules/eslint/unicode_bom.rs index 9437263fe587e..9d5bf76138e6f 100644 --- a/crates/oxc_linter/src/rules/eslint/unicode_bom.rs +++ b/crates/oxc_linter/src/rules/eslint/unicode_bom.rs @@ -63,9 +63,7 @@ declare_oxc_lint!( impl Rule for UnicodeBom { fn from_configuration(value: serde_json::Value) -> Result { - Ok(serde_json::from_value::>(value) - .unwrap_or_default() - .into_inner()) + serde_json::from_value::>(value).map(DefaultRuleConfig::into_inner) } fn run_once(&self, ctx: &LintContext) { diff --git a/crates/oxc_linter/src/rules/import/consistent_type_specifier_style.rs b/crates/oxc_linter/src/rules/import/consistent_type_specifier_style.rs index 957ebb18740f2..e221c056ed210 100644 --- a/crates/oxc_linter/src/rules/import/consistent_type_specifier_style.rs +++ b/crates/oxc_linter/src/rules/import/consistent_type_specifier_style.rs @@ -101,9 +101,7 @@ declare_oxc_lint!( impl Rule for ConsistentTypeSpecifierStyle { fn from_configuration(value: Value) -> Result { - Ok(serde_json::from_value::>(value) - .unwrap_or_default() - .into_inner()) + serde_json::from_value::>(value).map(DefaultRuleConfig::into_inner) } fn run<'a>(&self, node: &AstNode<'a>, ctx: &LintContext<'a>) { diff --git a/crates/oxc_linter/src/rules/react/prefer_es6_class.rs b/crates/oxc_linter/src/rules/react/prefer_es6_class.rs index d27c939d8a313..cb6695ebca26e 100644 --- a/crates/oxc_linter/src/rules/react/prefer_es6_class.rs +++ b/crates/oxc_linter/src/rules/react/prefer_es6_class.rs @@ -63,9 +63,7 @@ declare_oxc_lint!( impl Rule for PreferEs6Class { fn from_configuration(value: serde_json::Value) -> Result { - Ok(serde_json::from_value::>(value) - .unwrap_or_default() - .into_inner()) + serde_json::from_value::>(value).map(DefaultRuleConfig::into_inner) } fn run<'a>(&self, node: &AstNode<'a>, ctx: &LintContext<'a>) { diff --git a/crates/oxc_linter/src/rules/react/state_in_constructor.rs b/crates/oxc_linter/src/rules/react/state_in_constructor.rs index 19e40bfe6c742..6641515e8c0d9 100644 --- a/crates/oxc_linter/src/rules/react/state_in_constructor.rs +++ b/crates/oxc_linter/src/rules/react/state_in_constructor.rs @@ -129,9 +129,7 @@ declare_oxc_lint!( impl Rule for StateInConstructor { fn from_configuration(value: serde_json::Value) -> Result { - Ok(serde_json::from_value::>(value) - .unwrap_or_default() - .into_inner()) + serde_json::from_value::>(value).map(DefaultRuleConfig::into_inner) } fn run<'a>(&self, node: &AstNode<'a>, ctx: &LintContext<'a>) { diff --git a/crates/oxc_linter/src/rules/typescript/consistent_indexed_object_style.rs b/crates/oxc_linter/src/rules/typescript/consistent_indexed_object_style.rs index c1c7945c8834b..01ef56122dc70 100644 --- a/crates/oxc_linter/src/rules/typescript/consistent_indexed_object_style.rs +++ b/crates/oxc_linter/src/rules/typescript/consistent_indexed_object_style.rs @@ -110,9 +110,7 @@ declare_oxc_lint!( impl Rule for ConsistentIndexedObjectStyle { fn from_configuration(value: serde_json::Value) -> Result { - Ok(serde_json::from_value::>(value) - .unwrap_or_default() - .into_inner()) + serde_json::from_value::>(value).map(DefaultRuleConfig::into_inner) } fn run<'a>(&self, node: &AstNode<'a>, ctx: &LintContext<'a>) { diff --git a/crates/oxc_linter/src/rules/typescript/consistent_type_definitions.rs b/crates/oxc_linter/src/rules/typescript/consistent_type_definitions.rs index c78dd182f929a..00c0a66eea2a5 100644 --- a/crates/oxc_linter/src/rules/typescript/consistent_type_definitions.rs +++ b/crates/oxc_linter/src/rules/typescript/consistent_type_definitions.rs @@ -92,9 +92,7 @@ declare_oxc_lint!( impl Rule for ConsistentTypeDefinitions { fn from_configuration(value: serde_json::Value) -> Result { - Ok(serde_json::from_value::>(value) - .unwrap_or_default() - .into_inner()) + serde_json::from_value::>(value).map(DefaultRuleConfig::into_inner) } fn run<'a>(&self, node: &AstNode<'a>, ctx: &LintContext<'a>) { diff --git a/crates/oxc_linter/src/rules/typescript/return_await.rs b/crates/oxc_linter/src/rules/typescript/return_await.rs index cf221c525f923..fadec2da1fae8 100644 --- a/crates/oxc_linter/src/rules/typescript/return_await.rs +++ b/crates/oxc_linter/src/rules/typescript/return_await.rs @@ -105,9 +105,7 @@ declare_oxc_lint!( impl Rule for ReturnAwait { fn from_configuration(value: serde_json::Value) -> Result { - Ok(serde_json::from_value::>(value) - .unwrap_or_default() - .into_inner()) + serde_json::from_value::>(value).map(DefaultRuleConfig::into_inner) } fn to_configuration(&self) -> Option> { diff --git a/crates/oxc_linter/src/rules/unicorn/switch_case_braces.rs b/crates/oxc_linter/src/rules/unicorn/switch_case_braces.rs index 9e33562931a85..6e70ac85a761a 100644 --- a/crates/oxc_linter/src/rules/unicorn/switch_case_braces.rs +++ b/crates/oxc_linter/src/rules/unicorn/switch_case_braces.rs @@ -96,9 +96,7 @@ declare_oxc_lint!( impl Rule for SwitchCaseBraces { fn from_configuration(value: serde_json::Value) -> Result { - Ok(serde_json::from_value::>(value) - .unwrap_or_default() - .into_inner()) + serde_json::from_value::>(value).map(DefaultRuleConfig::into_inner) } fn run<'a>(&self, node: &AstNode<'a>, ctx: &LintContext<'a>) { diff --git a/crates/oxc_linter/src/rules/vue/define_emits_declaration.rs b/crates/oxc_linter/src/rules/vue/define_emits_declaration.rs index 836cdc11bef58..4b416b7f35da7 100644 --- a/crates/oxc_linter/src/rules/vue/define_emits_declaration.rs +++ b/crates/oxc_linter/src/rules/vue/define_emits_declaration.rs @@ -134,9 +134,7 @@ declare_oxc_lint!( impl Rule for DefineEmitsDeclaration { fn from_configuration(value: serde_json::Value) -> Result { - Ok(serde_json::from_value::>(value) - .unwrap_or_default() - .into_inner()) + serde_json::from_value::>(value).map(DefaultRuleConfig::into_inner) } fn run<'a>(&self, node: &AstNode<'a>, ctx: &LintContext<'a>) { diff --git a/crates/oxc_linter/src/rules/vue/define_props_declaration.rs b/crates/oxc_linter/src/rules/vue/define_props_declaration.rs index fa86a78be57d4..493fab7143d21 100644 --- a/crates/oxc_linter/src/rules/vue/define_props_declaration.rs +++ b/crates/oxc_linter/src/rules/vue/define_props_declaration.rs @@ -89,9 +89,7 @@ declare_oxc_lint!( impl Rule for DefinePropsDeclaration { fn from_configuration(value: serde_json::Value) -> Result { - Ok(serde_json::from_value::>(value) - .unwrap_or_default() - .into_inner()) + serde_json::from_value::>(value).map(DefaultRuleConfig::into_inner) } fn run<'a>(&self, node: &AstNode<'a>, ctx: &LintContext<'a>) {