Skip to content

Commit 2d9bc0e

Browse files
Fix all issues with new egglog version
1 parent 7176108 commit 2d9bc0e

22 files changed

+408
-556
lines changed

.cargo/config.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# https://doc.rust-lang.org/cargo/reference/config.html
2+
[build]
3+
# debug symbols https://pyo3.rs/main/debugging#common-setup
4+
rustflags = ["-g"]

Cargo.lock

Lines changed: 77 additions & 87 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "egglog_python"
33
version = "10.0.2"
4-
edition = "2021"
4+
edition = "2024"
55

66

77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -12,11 +12,11 @@ crate-type = ["cdylib"]
1212
[dependencies]
1313
pyo3 = { version = "0.23.0", features = ["extension-module"] }
1414

15-
egglog = { git = "https://github.com/egraphs-good/egglog", rev = "367a9143be7cb5354a54a9c5660d117440db77a6" }
16-
# egglog = { git = "https://github.com/saulshanabrook/egg-smol", rev = "8cd7c0e77a27c271cbaef09ab23514675d646937" }
17-
egglog-bridge = { git = "https://github.com/egraphs-good/egglog-backend.git", rev = "12e23e1" }
18-
core-relations = { git = "https://github.com/egraphs-good/egglog-backend.git", rev = "12e23e1" }
19-
# egglog-experimental = { git = "https://github.com/egraphs-good/egglog-experimental", rev = "8a1b3d6ad2723a8438f51f05027161e51f37917c" }
15+
# include this bugfix https://github.com/egraphs-good/egglog/pull/625
16+
egglog = { git = "https://github.com/saulshanabrook/egg-smol.git", rev = "051e523136270c05d2fb07253568441c0f4fd078" }
17+
egglog-bridge = { git = "https://github.com/egraphs-good/egglog-backend.git", rev = "a0b98d3" }
18+
core-relations = { git = "https://github.com/egraphs-good/egglog-backend.git", rev = "a0b98d3" }
19+
egglog-experimental = { git = "https://github.com/egraphs-good/egglog-experimental", rev = "2cf9d94" }
2020
egraph-serialize = { version = "0.2.0", features = ["serde", "graphviz"] }
2121
serde_json = "1.0.140"
2222
pyo3-log = "0.12.3"
@@ -25,13 +25,9 @@ lalrpop-util = { version = "0.22", features = ["lexer"] }
2525
ordered-float = "3.7.0"
2626
uuid = { version = "1.16.0", features = ["v4"] }
2727

28-
# Use unreleased version of egglog in experimental
29-
# [patch.'https://github.com/egraphs-good/egglog']
30-
# https://github.com/rust-lang/cargo/issues/5478#issuecomment-522719793
31-
# egglog = { git = "https://github.com/egraphs-good//egglog.git", rev = "6f494282442803201b512e9d0828007b52a0b29c" }
32-
33-
# [replace]
34-
# 'https://github.com/egraphs-good/egglog.git#[email protected]' = { git = "https://github.com/egraphs-good/egglog.git", rev = "215714e1cbb13ae9e21bed2f2e1bf95804571512" }
28+
# Use patched version of egglog in experimental
29+
[patch.'https://github.com/egraphs-good/egglog']
30+
egglog = { git = "https://github.com/saulshanabrook/egg-smol.git", rev = "051e523136270c05d2fb07253568441c0f4fd078" }
3531

3632
# enable debug symbols for easier profiling
3733
# [profile.release]

0 commit comments

Comments
 (0)