diff --git a/Cargo.lock b/Cargo.lock index af351a05839..b57e6bb04e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2491,42 +2491,39 @@ dependencies = [ [[package]] name = "ocaml" -version = "0.22.4" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a48b45c32924a3d95aea68f628ec93737bf7cfdb7b0d14344cf3d5176caa1302" +checksum = "8395e6be68fbf7c3d011b0dd3699660d22b17e981596cbad42454ccff041549b" dependencies = [ "ocaml-boxroot-sys", "ocaml-derive", - "ocaml-interop", "ocaml-sys", ] [[package]] name = "ocaml-boxroot-sys" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5186393bfbee4ce2bc5bbb82beafb77e85c1d0a557e3cfc8c8a0d63d7845fed5" +checksum = "0f3c2664a427c8046d334bf3a50fc466170a3dc53c65bc926a9be31a8e8debd1" dependencies = [ "cc", ] [[package]] name = "ocaml-derive" -version = "0.22.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40aa99a001268b85eb18414ecd190dc21fceaeaf81214ca28233b6feb25a998" +checksum = "3de4a0decff0fd3ee0928dfa15dac08651157f8f814e93b34fdf962190354035" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "synstructure 0.12.6", + "syn 2.0.100", ] [[package]] name = "ocaml-gen" version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4914382f332b97208183ef194eaca0bac9f155640719c74d5c7f7bc77511061b" +source = "git+https://github.com/o1-labs/ocaml-gen.git?branch=lyh/bump-ocaml-rs-to-1.3.0#1d7486788d72bc15fa98f76efda55dab4a508f53" dependencies = [ "const-random", "ocaml", @@ -2537,8 +2534,7 @@ dependencies = [ [[package]] name = "ocaml-gen-derive" version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7543703a85e10e5fd49258c8c820bda6e909d0feaf02f6db25197fe4b5f36bac" +source = "git+https://github.com/o1-labs/ocaml-gen.git?branch=lyh/bump-ocaml-rs-to-1.3.0#1d7486788d72bc15fa98f76efda55dab4a508f53" dependencies = [ "convert_case", "proc-macro2", @@ -2546,23 +2542,13 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ocaml-interop" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e01e08412a7e072a90a225d2ae49a2860aeea853ce673bc63891dbf86aed063" -dependencies = [ - "ocaml-boxroot-sys", - "ocaml-sys", - "static_assertions", -] - [[package]] name = "ocaml-sys" -version = "0.22.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ec6ca7d41458442627435afb8f4671e83fd642e8a560171d671a1f679aa3cf" +checksum = "14e0db66a4df18164b2318518bea3891b6fd05526253a71023267f8955dbaefa" dependencies = [ + "cc", "cty", ] @@ -3507,12 +3493,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.8.0" @@ -3611,18 +3591,6 @@ dependencies = [ "syn 2.0.100", ] -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - [[package]] name = "synstructure" version = "0.13.2" @@ -4027,12 +3995,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - [[package]] name = "unicode_categories" version = "0.1.1" @@ -4547,7 +4509,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.100", - "synstructure 0.13.2", + "synstructure", ] [[package]] @@ -4588,7 +4550,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.100", - "synstructure 0.13.2", + "synstructure", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index ea2bed36688..36a44a39d4e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,8 +58,8 @@ libflate = "2" log = "0.4.20" num-bigint = { version = "0.4.6", features = ["rand", "serde"] } num-integer = "0.1.45" -ocaml = { version = "0.22.2" } -ocaml-gen = { version = "1.0.0" } +ocaml = { version = "1.3.0" } +ocaml-gen = { git = "https://github.com/o1-labs/ocaml-gen.git", branch = "lyh/bump-ocaml-rs-to-1.3.0" } once_cell = "=1.21.3" os_pipe = { version = "1.1.4", features = ["io_safety"] } paste = "1.0.15" diff --git a/poseidon/src/sponge.rs b/poseidon/src/sponge.rs index 248d09af500..ce5c658f520 100644 --- a/poseidon/src/sponge.rs +++ b/poseidon/src/sponge.rs @@ -275,12 +275,12 @@ pub mod caml { // ScalarChallenge <-> CamlScalarChallenge // - #[derive(Debug, Clone, ocaml::IntoValue, ocaml::FromValue, ocaml_gen::Struct)] - pub struct CamlScalarChallenge(pub CamlF); + #[derive(Debug, Clone, ocaml::ToValue, ocaml::FromValue, ocaml_gen::Struct)] + pub struct CamlScalarChallenge(pub CamlF); impl From> for CamlScalarChallenge where - CamlF: From, + CamlF: From + ocaml::ToValue + ocaml::FromValue, { fn from(sc: ScalarChallenge) -> Self { Self(sc.0.into()) @@ -289,7 +289,7 @@ pub mod caml { impl From> for ScalarChallenge where - CamlF: Into, + CamlF: Into + ocaml::ToValue + ocaml::FromValue, { fn from(caml_sc: CamlScalarChallenge) -> Self { Self(caml_sc.0.into())