diff --git a/Cargo.lock b/Cargo.lock index 102adecb..b027408c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -223,14 +223,14 @@ dependencies = [ "egglog-bridge", "egglog-core-relations", "egglog-numeric-id", - "egraph-serialize", + "egraph-serialize 0.2.0", "hashbrown 0.15.5", "im-rc", "indexmap", "lazy_static", "log", "num", - "ordered-float", + "ordered-float 3.9.2", "rayon", "rustc-hash", "thiserror", @@ -338,18 +338,18 @@ dependencies = [ [[package]] name = "egglog_python" -version = "11.3.0" +version = "11.4.0" dependencies = [ "egglog", "egglog-bridge", "egglog-core-relations", "egglog-experimental", - "egraph-serialize", + "egraph-serialize 0.3.0", "lalrpop-util", "log", "num-bigint", "num-rational", - "ordered-float", + "ordered-float 3.9.2", "pyo3", "pyo3-log", "rayon", @@ -362,11 +362,22 @@ name = "egraph-serialize" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c31c5c0d7f760f9c1c84e21d73dcd3b3ce7a4770c27689f56a0db26e0f3e79ca" +dependencies = [ + "indexmap", + "once_cell", + "ordered-float 3.9.2", +] + +[[package]] +name = "egraph-serialize" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0977732fb537ace6f8c15ce160ebdda78b6502b4866d3b904e4fe752e2be4702" dependencies = [ "graphviz-rust", "indexmap", "once_cell", - "ordered-float", + "ordered-float 5.1.0", "serde", "serde_json", ] @@ -427,17 +438,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.1+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.3.3" @@ -447,14 +447,14 @@ dependencies = [ "cfg-if", "libc", "r-efi", - "wasi 0.14.7+wasi-0.2.4", + "wasi", ] [[package]] name = "graphviz-rust" -version = "0.6.6" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27dafd1ac303e0dfb347a3861d9ac440859bab26ec2f534bbceb262ea492a1e0" +checksum = "db134cb611668917cabf340af9a39518426f9a10827b4cedcb4cdcf84443f6d0" dependencies = [ "dot-generator", "dot-structures", @@ -462,7 +462,7 @@ dependencies = [ "into-attr-derive", "pest", "pest_derive", - "rand 0.8.5", + "rand 0.9.2", "tempfile", ] @@ -708,6 +708,15 @@ name = "ordered-float" version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-float" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4779c6901a562440c3786d08192c6fbda7c1c2060edd10006b05ee35d10f2d" dependencies = [ "num-traits", "rand 0.8.5", @@ -845,9 +854,9 @@ dependencies = [ [[package]] name = "pyo3-log" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833e6fdc21553e9938d9443050ed3c7787ac3c1a1aefccbd03dfae0c7a4be529" +checksum = "2f8bae9ad5ba08b0b0ed2bb9c2bdbaeccc69cafca96d78cf0fbcea0d45d122bb" dependencies = [ "arc-swap", "log", @@ -900,8 +909,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "libc", - "rand_chacha 0.3.1", "rand_core 0.6.4", "serde", ] @@ -912,20 +919,10 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ - "rand_chacha 0.9.0", + "rand_chacha", "rand_core 0.9.3", ] -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - [[package]] name = "rand_chacha" version = "0.9.0" @@ -942,7 +939,6 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.16", "serde", ] @@ -952,7 +948,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.3", + "getrandom", ] [[package]] @@ -1153,7 +1149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53" dependencies = [ "fastrand", - "getrandom 0.3.3", + "getrandom", "once_cell", "rustix", "windows-sys", @@ -1209,7 +1205,7 @@ version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" dependencies = [ - "getrandom 0.3.3", + "getrandom", "js-sys", "wasm-bindgen", ] @@ -1220,12 +1216,6 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" -[[package]] -name = "wasi" -version = "0.11.1+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" - [[package]] name = "wasi" version = "0.14.7+wasi-0.2.4" diff --git a/Cargo.toml b/Cargo.toml index bfbbe8fc..cb870c3e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ egglog = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "clo egglog-bridge = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "clone-cost" } egglog-core-relations = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "clone-cost" } egglog-experimental = { git = "https://github.com/egraphs-good/egglog-experimental", branch = "cli", default-features = false } -egraph-serialize = { version = "0.2", features = ["serde", "graphviz"] } +egraph-serialize = { version = "0.3", features = ["serde", "graphviz"] } serde_json = "1" pyo3-log = "0.13" log = "0.4"