Skip to content

bump ocaml-rs to 1.3.0 #3376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
glyh wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

bump ocaml-rs to 1.3.0 #3376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2d058a
bump ocaml-rs to 1.3.0
glyh Dec 2, 2025
dbfe525
port poseidon sponge to ocaml-rs.1.3.0
glyh Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 14 additions & 52 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions poseidon/src/sponge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,12 +275,12 @@ pub mod caml {
// ScalarChallenge<F> <-> CamlScalarChallenge<CamlF>
//

#[derive(Debug, Clone, ocaml::IntoValue, ocaml::FromValue, ocaml_gen::Struct)]
pub struct CamlScalarChallenge<CamlF>(pub CamlF);
#[derive(Debug, Clone, ocaml::ToValue, ocaml::FromValue, ocaml_gen::Struct)]
pub struct CamlScalarChallenge<CamlF: ocaml::ToValue + ocaml::FromValue>(pub CamlF);

impl<F, CamlF> From<ScalarChallenge<F>> for CamlScalarChallenge<CamlF>
where
CamlF: From<F>,
CamlF: From<F> + ocaml::ToValue + ocaml::FromValue,
{
fn from(sc: ScalarChallenge<F>) -> Self {
Self(sc.0.into())
Expand All @@ -289,7 +289,7 @@ pub mod caml {

impl<F, CamlF> From<CamlScalarChallenge<CamlF>> for ScalarChallenge<F>
where
CamlF: Into<F>,
CamlF: Into<F> + ocaml::ToValue + ocaml::FromValue,
{
fn from(caml_sc: CamlScalarChallenge<CamlF>) -> Self {
Self(caml_sc.0.into())
Expand Down
Loading