refactor(all): enable unnecessary_unwrap lint

camc314 · camc314 · commit a612ae8aaa1a · 2025-08-08T12:56:38.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -96,7 +96,6 @@ unused_peekable = "warn"
 too_long_first_doc_paragraph = "warn"
 suspicious_operation_groupings = "warn"
 redundant_clone = "warn"
-unnecessary_unwrap = "allow" # FIXME
 needless_doctest_main = "allow" # FIXME
 zero_sized_map_values = "allow" # FIXME https://github.com/rust-lang/rust-clippy/issues/15429
 # cargo
diff --git a/crates/oxc_linter/src/rules/nextjs/no_duplicate_head.rs b/crates/oxc_linter/src/rules/nextjs/no_duplicate_head.rs
@@ -110,13 +110,14 @@ impl Rule for NoDuplicateHead {
             }
 
             let node_id = reference.node_id();
-            if first_node_id.is_none() {
-                // First `<Head>` found
-                first_node_id = Some(node_id);
-            } else if labels.is_empty() {
+            if labels.is_empty()
+                && let Some(first_node_id) = first_node_id
+            {
                 // 2nd `<Head>` found - populate `labels` with both
-                let first_node_id = first_node_id.unwrap();
                 labels.extend([get_label(first_node_id), get_label(node_id)]);
+            } else if first_node_id.is_none() {
+                // First `<Head>` found
+                first_node_id = Some(node_id);
             } else {
                 // Further `<Head>` found - add to `node_ids`
                 labels.push(get_label(node_id));
diff --git a/crates/oxc_parser/src/js/module.rs b/crates/oxc_parser/src/js/module.rs
@@ -81,11 +81,13 @@ impl<'a> ParserImpl<'a> {
         let mut phase = None;
         let mut import_kind = ImportOrExportKind::Value;
 
-        if self.at(Kind::Eq) && identifier_after_import.is_some() {
+        if self.at(Kind::Eq)
+            && let Some(identifier_after_import) = identifier_after_import
+        {
             // `import something = ...`
             let decl = self.parse_ts_import_equals_declaration(
                 ImportOrExportKind::Value,
-                identifier_after_import.unwrap(),
+                identifier_after_import,
                 span,
             );
             return Statement::from(decl);
