From 9ac9164a46e9d90c44a354cadaa29c9b5210e81e Mon Sep 17 00:00:00 2001 From: gabrielbosio Date: Mon, 4 Mar 2024 10:38:51 -0300 Subject: [PATCH] Downgrade Rust version that bumpalo uses So that the Rust version bumpalo uses matches with the Rust version this repo uses. --- Cargo.lock | 52 +++++++++++++++++++++-------------------------- kimchi/Cargo.toml | 4 ++++ 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 55eeb5a096..fe7433a1fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -408,9 +408,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byteorder" @@ -656,16 +656,16 @@ dependencies = [ [[package]] name = "criterion" -version = "0.3.4" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" +checksum = "70daa7ceec6cf143990669a04c7df13391d55fb27bd4079d252fca774ba244d8" dependencies = [ "atty", "cast 0.2.7", "clap 2.34.0", "criterion-plot", "csv", - "itertools", + "itertools 0.9.0", "lazy_static", "num-traits", "oorandom", @@ -687,7 +687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" dependencies = [ "cast 0.3.0", - "itertools", + "itertools 0.10.5", ] [[package]] @@ -1229,6 +1229,15 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" +[[package]] +name = "itertools" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.10.5" @@ -1280,7 +1289,7 @@ dependencies = [ "hex", "iai", "internal-tracing", - "itertools", + "itertools 0.10.5", "mina-curves", "mina-poseidon", "num-bigint", @@ -1308,6 +1317,7 @@ dependencies = [ "tiny-keccak", "turshi", "wasm-bindgen", + "web-sys", ] [[package]] @@ -1977,32 +1987,16 @@ dependencies = [ [[package]] name = "plotters" -version = "0.3.0" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a" +checksum = "4e3bb8da247d27ae212529352020f3e5ee16e83c0c258061d27b08ab92675eeb" dependencies = [ + "js-sys", "num-traits", - "plotters-backend", - "plotters-svg", "wasm-bindgen", "web-sys", ] -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - [[package]] name = "poly-commitment" version = "0.1.0" @@ -2015,7 +2009,7 @@ dependencies = [ "blake2", "colored", "groupmap", - "itertools", + "itertools 0.10.5", "mina-curves", "mina-poseidon", "o1-utils", @@ -3000,9 +2994,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/kimchi/Cargo.toml b/kimchi/Cargo.toml index 4d03627759..9f200b2821 100644 --- a/kimchi/Cargo.toml +++ b/kimchi/Cargo.toml @@ -52,6 +52,7 @@ ocaml = { version = "0.22.2", optional = true } ocaml-gen = { version = "0.1.5", optional = true } wasm-bindgen = { version = "=0.2.87", optional = true } +web-sys = { version = "0.3.36", features = ["Window", "Document", "HtmlElement", "Text", "Node", "Element", "console" ] } internal-tracing = { path = "../internal-tracing", version = "0.1.0" } @@ -87,3 +88,6 @@ bn254 = [ "ark-bn254" ] keccak-sponges = [ "tiny-keccak" ] wasm_types = [ "wasm-bindgen" ] check_feature_flags = [] + +[patch.crates-io] +bumpalo = { git = 'https://github.com/lambdaclass/bumpalo.git', branch = 'downgrade_rust_version' }