feat(rust): oxc-index-vec v4.0

Author: Boshen

Cargo.lock

@@ -158,7 +158,7 @@ unicode-id-start = "1"
 javascript-globals = "1"
 json-strip-comments = "3"
 oxc-browserslist = "2"
-oxc_index = "3"
+oxc_index = { version = "4", features = ["nonmax", "serde"] }
 oxc_resolver = "11"
 oxc_sourcemap = "4"
 

Cargo.toml

@@ -26,6 +26,5 @@ oxc_syntax = { workspace = true }
 
 bitflags = { workspace = true }
 itertools = { workspace = true }
-nonmax = { workspace = true }
 petgraph = { workspace = true, default-features = false, features = ["std", "stable_graph"] }
 rustc-hash = { workspace = true }

crates/oxc_cfg/Cargo.toml

@@ -45,7 +45,7 @@ impl DisplayDot for ControlFlowGraph {
                     let block = &self.basic_blocks[*node.1];
                     let mut attrs = Attrs::default().with("label", block.display_dot());
 
-                    if *node.1 == 0 {
+                    if node.1.index() == 0 {
                         attrs += ("color", "green");
                     }
                     if block.is_unreachable() {

crates/oxc_cfg/src/dot.rs

@@ -6,8 +6,7 @@ pub mod visit;
 use std::fmt;
 
 use itertools::Itertools;
-use nonmax::NonMaxU32;
-use oxc_index::{Idx, IndexVec};
+use oxc_index::{IndexVec, define_nonmax_u32_index_type};
 use petgraph::{
     Direction,
     visit::{Control, DfsEvent, EdgeRef},
@@ -28,20 +27,9 @@ pub use dot::DisplayDot;
 use visit::set_depth_first_search;
 
 pub type BlockNodeId = petgraph::stable_graph::NodeIndex;
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct BasicBlockId(NonMaxU32);
-
-impl Idx for BasicBlockId {
-    #[expect(clippy::cast_possible_truncation)]
-    fn from_usize(idx: usize) -> Self {
-        assert!(idx < u32::MAX as usize);
-        // SAFETY: We just checked `idx` is valid for `NonMaxU32`
-        Self(unsafe { NonMaxU32::new_unchecked(idx as u32) })
-    }
 
-    fn index(self) -> usize {
-        self.0.get() as usize
-    }
+define_nonmax_u32_index_type! {
+    pub struct BasicBlockId;
 }
 
 impl PartialEq<u32> for BasicBlockId {

crates/oxc_cfg/src/lib.rs

@@ -33,7 +33,6 @@ bitflags = { workspace = true }
 cow-utils = { workspace = true }
 dragonbox_ecma = { workspace = true }
 itoa = { workspace = true }
-nonmax = { workspace = true }
 rustc-hash = { workspace = true }
 
 [dev-dependencies]

crates/oxc_codegen/Cargo.toml

@@ -1,8 +1,6 @@
 use std::path::Path;
 
-use nonmax::NonMaxU32;
-
-use oxc_index::{Idx, IndexVec};
+use oxc_index::{IndexVec, define_nonmax_u32_index_type};
 use oxc_span::Span;
 use oxc_syntax::identifier::{LS, PS};
 
@@ -11,21 +9,9 @@ use crate::str::{LS_LAST_2_BYTES, LS_OR_PS_FIRST_BYTE, PS_LAST_2_BYTES};
 /// Number of lines to check with linear search when translating byte position to line index
 const LINE_SEARCH_LINEAR_ITERATIONS: usize = 16;
 
-/// Index into vec of `ColumnOffsets`
-#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub struct ColumnOffsetsId(NonMaxU32);
-
-impl Idx for ColumnOffsetsId {
-    #[expect(clippy::cast_possible_truncation)]
-    fn from_usize(idx: usize) -> Self {
-        assert!(idx < u32::MAX as usize);
-        // SAFETY: We just checked `idx` is a legal value for `NonMaxU32`
-        Self(unsafe { NonMaxU32::new_unchecked(idx as u32) })
-    }
-
-    fn index(self) -> usize {
-        self.0.get() as usize
-    }
+define_nonmax_u32_index_type! {
+    /// Index into vec of `ColumnOffsets`
+    struct ColumnOffsetsId;
 }
 
 /// Line offset tables.

crates/oxc_codegen/src/sourcemap_builder.rs

@@ -35,7 +35,7 @@ oxc_codegen = { workspace = true }
 oxc_data_structures = { workspace = true, features = ["box_macros"] }
 oxc_diagnostics = { workspace = true }
 oxc_ecmascript = { workspace = true }
-oxc_index = { workspace = true, features = ["serde"] }
+oxc_index = { workspace = true }
 oxc_macros = { workspace = true, features = ["ruledocs"] }
 oxc_parser = { workspace = true }
 oxc_regular_expression = { workspace = true }
@@ -59,7 +59,6 @@ json-strip-comments = { workspace = true }
 language-tags = { workspace = true }
 lazy-regex = { workspace = true }
 memchr = { workspace = true }
-nonmax = { workspace = true }
 papaya = { workspace = true }
 phf = { workspace = true, features = ["macros"] }
 rayon = { workspace = true }

crates/oxc_linter/Cargo.toml

@@ -1,7 +1,5 @@
-use nonmax::NonMaxU32;
-
 use oxc_diagnostics::OxcDiagnostic;
-use oxc_index::{Idx, IndexVec};
+use oxc_index::{IndexVec, define_nonmax_u32_index_type};
 use oxc_macros::declare_oxc_lint;
 use oxc_regular_expression::{
     ast::LookAroundAssertionKind,
@@ -117,20 +115,8 @@ enum BackRefInfoTarget<'a> {
     Name(&'a str),
 }
 
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct RegexNodeId(NonMaxU32);
-
-impl Idx for RegexNodeId {
-    #[expect(clippy::cast_possible_truncation)]
-    fn from_usize(idx: usize) -> Self {
-        assert!(idx < u32::MAX as usize);
-        // SAFETY: We just checked `idx` is valid for `NonMaxU32`
-        Self(unsafe { NonMaxU32::new_unchecked(idx as u32) })
-    }
-
-    fn index(self) -> usize {
-        self.0.get() as usize
-    }
+define_nonmax_u32_index_type! {
+    pub struct RegexNodeId;
 }
 
 #[derive(Debug)]

crates/oxc_linter/src/rules/eslint/no_useless_backreference.rs

@@ -1,6 +1,5 @@
 use oxc_ast::{AstKind, ast::Expression};
 use oxc_diagnostics::OxcDiagnostic;
-use oxc_index::Idx;
 use oxc_macros::declare_oxc_lint;
 use oxc_span::Span;
 use rustc_hash::FxHashMap;
@@ -500,7 +499,7 @@ fn test() {
         (
             " test('should pass', async () => {
 			     expect.hasAssertions();
-			   
+
 			     expect(true).toBeDefined();
 			     expect(true).toBeDefined();
 			     expect(true).toBeDefined();