chore: ugprade oxc to 0.75

Author: hugoclrd

Cargo.lock

@@ -8,14 +8,14 @@ license = "GPL-3.0"
 [dependencies]
 anyhow = "1.0.98"
 
-oxc_allocator = "0.73"
-oxc_ast = { version = "0.73", features = ["serialize"] }
-oxc_ast_visit = "0.73"
-oxc_parser = "0.73"
-oxc_span = "0.73"
-oxc_syntax = "0.73"
-oxc_traverse = "0.73"
-oxc_semantic = "0.73"
+oxc_allocator = "0.75"
+oxc_ast = { version = "0.75", features = ["serialize"] }
+oxc_ast_visit = "0.75"
+oxc_parser = "0.75"
+oxc_span = "0.75"
+oxc_syntax = "0.75"
+oxc_traverse = "0.75"
+oxc_semantic = "0.75"
 
 clarity = { workspace = true }
 

components/ts-to-clar/Cargo.toml

@@ -3,6 +3,7 @@ use std::sync::OnceLock;
 
 pub static STD_PKG_NAME: &str = "@hirosystems/clarity-std";
 
+#[allow(dead_code)]
 pub fn get_std() -> Vec<String> {
     use NativeFunctions::*;
 
@@ -47,8 +48,9 @@ pub fn get_std() -> Vec<String> {
 
 static STD_FUNCTIONS: OnceLock<Vec<String>> = OnceLock::new();
 
+#[allow(dead_code)]
 pub fn get_std_functions() -> &'static Vec<String> {
-    STD_FUNCTIONS.get_or_init(|| get_std())
+    STD_FUNCTIONS.get_or_init(get_std)
 }
 
 #[cfg(test)]

components/ts-to-clar/src/clarity_std.rs

@@ -1,4 +1,4 @@
-use std::cell::Cell;
+use std::{cell::Cell, marker::PhantomData};
 
 use clarity::vm::{
     representations::{PreSymbolicExpression, PreSymbolicExpressionType},
@@ -9,7 +9,7 @@ use oxc_allocator::{Allocator, CloneIn};
 use oxc_ast::ast::{self, Expression};
 use oxc_semantic::SemanticBuilder;
 use oxc_span::SourceType;
-use oxc_traverse::{traverse_mut, Ancestor, Traverse, TraverseCtx};
+use oxc_traverse::{traverse_mut, Ancestor, Traverse};
 
 use crate::{
     parser::{IRFunction, IR},
@@ -200,7 +200,15 @@ impl<'a> StatementConverter<'a> {
     }
 }
 
-impl<'a> Traverse<'a> for StatementConverter<'a> {
+// introduced in oxc 0.75, not used yet
+// could be used to store additional state during traversal
+#[derive(Default)]
+pub struct ConverterState<'a> {
+    data: PhantomData<&'a ()>,
+}
+pub type TraverseCtx<'a> = oxc_traverse::TraverseCtx<'a, ConverterState<'a>>;
+
+impl<'a> Traverse<'a, ConverterState<'a>> for StatementConverter<'a> {
     fn enter_program(&mut self, _node: &mut ast::Program<'a>, _ctx: &mut TraverseCtx<'a>) {
         // println!("enter_program: {:#?}", _node);
     }
@@ -580,7 +588,8 @@ pub fn convert_function_body<'a>(
         .into_scoping();
 
     let mut converter = StatementConverter::new(ir, function);
-    traverse_mut(&mut converter, allocator, &mut program, scoping);
+    let state = ConverterState::default();
+    traverse_mut(&mut converter, allocator, &mut program, scoping, state);
 
     if converter.expressions.is_empty() {
         return Err(anyhow::anyhow!("No expressions found"));

components/ts-to-clar/src/expression_converter.rs

@@ -7,6 +7,8 @@
 //  - define-public
 //  - define-private
 
+use std::marker::PhantomData;
+
 use anyhow::{anyhow, Result};
 use oxc_allocator::{Allocator, CloneIn};
 use oxc_ast::ast::{
@@ -16,7 +18,7 @@ use oxc_ast::ast::{
 use oxc_parser::Parser;
 use oxc_semantic::SemanticBuilder;
 use oxc_span::SourceType;
-use oxc_traverse::{traverse_mut, Traverse, TraverseCtx};
+use oxc_traverse::{traverse_mut, Traverse};
 
 use clarity::vm::types::TypeSignature;
 
@@ -115,7 +117,15 @@ fn parse_function_params(
         .collect()
 }
 
-impl<'a> Traverse<'a> for IR<'a> {
+// introduced in oxc 0.75, not used yet
+// could be used to store additional state during traversal
+#[derive(Default)]
+pub struct ConverterState<'a> {
+    data: PhantomData<&'a ()>,
+}
+pub type TraverseCtx<'a> = oxc_traverse::TraverseCtx<'a, ConverterState<'a>>;
+
+impl<'a> Traverse<'a, ConverterState<'a>> for IR<'a> {
     fn enter_import_declaration(
         &mut self,
         node: &mut ast::ImportDeclaration<'a>,
@@ -324,7 +334,9 @@ pub fn get_ir<'a>(allocator: &'a Allocator, file_name: &str, source: &'a str) ->
         .build(&module)
         .semantic
         .into_scoping();
-    traverse_mut(&mut ir, allocator, &mut module, scoping);
+
+    let state = ConverterState::default();
+    traverse_mut(&mut ir, allocator, &mut module, scoping, state);
 
     ir
 }