From 2ccbd9361bbfbad01ce14b84f9296515da3ad66a Mon Sep 17 00:00:00 2001 From: overlookmotel <557937+overlookmotel@users.noreply.github.com> Date: Mon, 2 Sep 2024 18:42:02 +0000 Subject: [PATCH] refactor(linter): `react/jsx_no_undef` rule `get_member_ident` do not return Option (#5411) Small tidy-up after #5358. `get_member_ident` now always returns a value, never `None`, so no need for it to return an `Option`. --- crates/oxc_linter/src/rules/react/jsx_no_undef.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/oxc_linter/src/rules/react/jsx_no_undef.rs b/crates/oxc_linter/src/rules/react/jsx_no_undef.rs index 603999338..0e95498f2 100644 --- a/crates/oxc_linter/src/rules/react/jsx_no_undef.rs +++ b/crates/oxc_linter/src/rules/react/jsx_no_undef.rs @@ -37,14 +37,14 @@ fn get_resolvable_ident<'a>(node: &'a JSXElementName<'a>) -> Option<&'a Identifi match node { JSXElementName::Identifier(_) | JSXElementName::NamespacedName(_) => None, JSXElementName::IdentifierReference(ref ident) => Some(ident), - JSXElementName::MemberExpression(expr) => get_member_ident(expr), + JSXElementName::MemberExpression(expr) => Some(get_member_ident(expr)), } } -fn get_member_ident<'a>(mut expr: &'a JSXMemberExpression<'a>) -> Option<&'a IdentifierReference> { +fn get_member_ident<'a>(mut expr: &'a JSXMemberExpression<'a>) -> &'a IdentifierReference { loop { match &expr.object { - JSXMemberExpressionObject::IdentifierReference(ident) => return Some(ident), + JSXMemberExpressionObject::IdentifierReference(ident) => return ident, JSXMemberExpressionObject::MemberExpression(next_expr) => { expr = next_expr; }