refactor(data_structures)!: remove PointerExt trait

Author: overlookmotel

Cargo.lock

@@ -154,7 +154,6 @@ indexmap = "2"
 proc-macro2 = "1"
 quote = "1"
 rustc-hash = "2"
-rustversion = "1"
 serde = "1"
 serde_json = "1"
 syn = { version = "2", default-features = false }

Cargo.toml

@@ -20,7 +20,7 @@ doctest = true
 
 [dependencies]
 oxc_ast_macros = { workspace = true, optional = true }
-oxc_data_structures = { workspace = true, features = ["assert_unchecked", "pointer_ext"] }
+oxc_data_structures = { workspace = true, features = ["assert_unchecked"] }
 oxc_estree = { workspace = true, optional = true }
 
 allocator-api2 = { workspace = true }

crates/oxc_allocator/Cargo.toml

@@ -15,8 +15,6 @@ use std::{
 
 use bumpalo::Bump;
 
-use oxc_data_structures::pointer_ext::PointerExt;
-
 use crate::Allocator;
 
 /// Minimum alignment for allocator chunks. This is hard-coded on `bumpalo`.
@@ -166,7 +164,7 @@ impl Allocator {
         let cursor_ptr = self.cursor_ptr();
         // SAFETY: Cursor pointer is always `>=` data pointer.
         // Both pointers are within same allocation, and derived from the same original pointer.
-        let free_capacity = unsafe { cursor_ptr.offset_from_usize(data_ptr) };
+        let free_capacity = unsafe { cursor_ptr.offset_from_unsigned(data_ptr) };
 
         // Check sufficient capacity to write `alloc_bytes` bytes, without overwriting data already
         // stored in allocator.

crates/oxc_allocator/src/from_raw_parts.rs

@@ -11,7 +11,7 @@ use std::{
     slice, str,
 };
 
-use oxc_data_structures::{assert_unchecked, pointer_ext::PointerExt};
+use oxc_data_structures::assert_unchecked;
 
 use crate::{Allocator, alloc::Alloc};
 
@@ -245,7 +245,7 @@ impl<'a> StringBuilder<'a> {
     #[inline(always)]
     pub fn len(&self) -> usize {
         // SAFETY: `end_ptr` is always equal to or after `start_ptr`
-        unsafe { self.end_ptr.offset_from_usize(self.start_ptr) }
+        unsafe { self.end_ptr.offset_from_unsigned(self.start_ptr) }
     }
 
     /// Returns `true` if string is empty.
@@ -258,7 +258,7 @@ impl<'a> StringBuilder<'a> {
     #[inline(always)]
     pub fn capacity(&self) -> usize {
         // SAFETY: `end_capacity_ptr` is always equal to or after `start_ptr`
-        unsafe { self.end_capacity_ptr.offset_from_usize(self.start_ptr) }
+        unsafe { self.end_capacity_ptr.offset_from_unsigned(self.start_ptr) }
     }
 
     /// Consume [`StringBuilder`] and produce a `&'a str` with lifetime of the arena.
@@ -437,7 +437,7 @@ impl<'a> StringBuilder<'a> {
     #[inline(always)]
     pub fn reserve(&mut self, additional: usize) {
         // SAFETY: `end_capacity` is always equal to or after `end`
-        let free_bytes = unsafe { self.end_capacity_ptr.offset_from_usize(self.end_ptr) };
+        let free_bytes = unsafe { self.end_capacity_ptr.offset_from_unsigned(self.end_ptr) };
         if free_bytes < additional {
             // Insufficient capacity for `additional` bytes. Grow the allocation.
             // SAFETY: We just checked allocation is full to capacity.

crates/oxc_allocator/src/string_builder.rs

@@ -21,7 +21,6 @@ doctest = false
 [dependencies]
 oxc_allocator = { workspace = true }
 oxc_ast = { workspace = true }
-oxc_data_structures = { workspace = true, features = ["pointer_ext"], optional = true }
 oxc_span = { workspace = true }
 oxc_syntax = { workspace = true }
 
@@ -30,7 +29,6 @@ default = []
 serialize = [
   "oxc_allocator/serialize",
   "oxc_ast/serialize",
-  "oxc_data_structures",
   "oxc_span/serialize",
   "oxc_syntax/serialize",
 ]

crates/oxc_ast_visit/Cargo.toml

@@ -3,7 +3,6 @@
 use std::{cmp::min, slice};
 
 use oxc_ast::ast::{Comment, Program};
-use oxc_data_structures::pointer_ext::PointerExt;
 use oxc_span::Span;
 use oxc_syntax::module_record::{ModuleRecord, VisitMutModuleRecord};
 
@@ -552,7 +551,7 @@ fn build_translations(source_text: &str, translations: &mut Vec<Translation>) {
         if chunk.contains_unicode() {
             // SAFETY: `ptr` is equal to or after `start_ptr`. Both are within bounds of `bytes`.
             // `ptr` is derived from `start_ptr`.
-            let offset = unsafe { ptr.offset_from_usize(start_ptr) };
+            let offset = unsafe { ptr.offset_from_unsigned(start_ptr) };
             process_slice(chunk.as_slice(), offset);
         }
 
@@ -573,7 +572,7 @@ fn build_translations(source_text: &str, translations: &mut Vec<Translation>) {
         let last_chunk = unsafe { slice::from_raw_parts(ptr, remaining_len) };
         // SAFETY: `ptr` is after `start_ptr`. Both are within bounds of `bytes`.
         // `ptr` is derived from `start_ptr`.
-        let offset = unsafe { ptr.offset_from_usize(start_ptr) };
+        let offset = unsafe { ptr.offset_from_unsigned(start_ptr) };
         process_slice(last_chunk, offset);
     }
 }

crates/oxc_ast_visit/src/utf8_to_utf16.rs

@@ -22,7 +22,7 @@ doctest = true
 [dependencies]
 oxc_allocator = { workspace = true }
 oxc_ast = { workspace = true }
-oxc_data_structures = { workspace = true, features = ["code_buffer", "pointer_ext", "slice_iter_ext", "stack"] }
+oxc_data_structures = { workspace = true, features = ["code_buffer", "slice_iter_ext", "stack"] }
 oxc_index = { workspace = true }
 oxc_semantic = { workspace = true }
 oxc_sourcemap = { workspace = true }

crates/oxc_codegen/Cargo.toml

@@ -8,7 +8,6 @@
 use std::{borrow::Cow, cmp, slice};
 
 use cow_utils::CowUtils;
-use oxc_data_structures::pointer_ext::PointerExt;
 
 mod binary_expr_visitor;
 mod comment;
@@ -280,7 +279,7 @@ impl<'a> Codegen<'a> {
                         // `index` is on `<`, so `index + 1` is in bounds and a UTF-8 char boundary.
                         // `consumed` is always less than `index + 1` as it's set on a previous round.
                         unsafe {
-                            let index = ptr.offset_from_usize(bytes.as_ptr());
+                            let index = ptr.offset_from_unsigned(bytes.as_ptr());
                             let before = bytes.get_unchecked(consumed..=index);
                             self.code.print_bytes_unchecked(before);
 

crates/oxc_codegen/src/lib.rs

@@ -1,9 +1,7 @@
 use std::slice;
 
 use oxc_ast::ast::StringLiteral;
-use oxc_data_structures::{
-    assert_unchecked, pointer_ext::PointerExt, slice_iter_ext::SliceIterExt,
-};
+use oxc_data_structures::{assert_unchecked, slice_iter_ext::SliceIterExt};
 use oxc_syntax::identifier::{LS, NBSP, PS};
 
 use crate::Codegen;
@@ -186,7 +184,7 @@ impl PrintStringState<'_> {
         // and the iterator only advances, so current position of `bytes` must be on or after `chunk_start`
         let len = unsafe {
             let bytes_ptr = self.bytes.as_slice().as_ptr();
-            bytes_ptr.offset_from_usize(self.chunk_start)
+            bytes_ptr.offset_from_unsigned(self.chunk_start)
         };
 
         // SAFETY: `chunk_start` is within bounds of original `&str`.