From e013b118f25f3fa1c7b41347b9b7eefb7cea839d Mon Sep 17 00:00:00 2001 From: oliver Date: Wed, 23 Oct 2024 14:52:14 -0700 Subject: [PATCH] fix up cargo.toml --- Cargo.lock | 30 +++++++++++++----------------- Cargo.toml | 13 ++++++------- dag_in_context/Cargo.toml | 2 +- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a0537ceb..03b860f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -205,6 +205,7 @@ dependencies = [ [[package]] name = "bril-rs" version = "0.1.0" +source = "git+https://github.com/uwplse/bril?rev=a48c5e18575aa738e8d08ff483ee23d6c2735107#a48c5e18575aa738e8d08ff483ee23d6c2735107" dependencies = [ "serde", "serde_json", @@ -214,17 +215,7 @@ dependencies = [ [[package]] name = "bril-rs" version = "0.1.0" -source = "git+https://github.com/uwplse/bril?rev=7ac4c001115aee8e39e7e0e5ad6e23bdb9c0ab76#7ac4c001115aee8e39e7e0e5ad6e23bdb9c0ab76" -dependencies = [ - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "bril-rs" -version = "0.1.0" -source = "git+https://github.com/uwplse/bril#e2be3f5d7e160f02b7aed0ef2bcc3e13ae722d2b" +source = "git+https://github.com/uwplse/bril#a48c5e18575aa738e8d08ff483ee23d6c2735107" dependencies = [ "serde", "serde_json", @@ -234,8 +225,9 @@ dependencies = [ [[package]] name = "bril2json" version = "0.1.0" +source = "git+https://github.com/uwplse/bril?rev=a48c5e18575aa738e8d08ff483ee23d6c2735107#a48c5e18575aa738e8d08ff483ee23d6c2735107" dependencies = [ - "bril-rs 0.1.0", + "bril-rs 0.1.0 (git+https://github.com/uwplse/bril?rev=a48c5e18575aa738e8d08ff483ee23d6c2735107)", "clap", "lalrpop", "lalrpop-util", @@ -245,9 +237,10 @@ dependencies = [ [[package]] name = "brilift" version = "0.1.0" +source = "git+https://github.com/uwplse/bril?rev=a48c5e18575aa738e8d08ff483ee23d6c2735107#a48c5e18575aa738e8d08ff483ee23d6c2735107" dependencies = [ "argh", - "bril-rs 0.1.0", + "bril-rs 0.1.0 (git+https://github.com/uwplse/bril?rev=a48c5e18575aa738e8d08ff483ee23d6c2735107)", "cranelift-codegen", "cranelift-frontend", "cranelift-jit", @@ -261,8 +254,9 @@ dependencies = [ [[package]] name = "brilirs" version = "0.1.0" +source = "git+https://github.com/uwplse/bril?rev=a48c5e18575aa738e8d08ff483ee23d6c2735107#a48c5e18575aa738e8d08ff483ee23d6c2735107" dependencies = [ - "bril-rs 0.1.0", + "bril-rs 0.1.0 (git+https://github.com/uwplse/bril?rev=a48c5e18575aa738e8d08ff483ee23d6c2735107)", "bril2json", "clap", "fxhash", @@ -274,6 +268,7 @@ dependencies = [ [[package]] name = "brillvm" version = "0.1.0" +source = "git+https://github.com/uwplse/bril?rev=a48c5e18575aa738e8d08ff483ee23d6c2735107#a48c5e18575aa738e8d08ff483ee23d6c2735107" dependencies = [ "bril-rs 0.1.0 (git+https://github.com/uwplse/bril)", "clap", @@ -544,7 +539,7 @@ dependencies = [ name = "dag_in_context" version = "0.1.0" dependencies = [ - "bril-rs 0.1.0 (git+https://github.com/uwplse/bril?rev=7ac4c001115aee8e39e7e0e5ad6e23bdb9c0ab76)", + "bril-rs 0.1.0 (git+https://github.com/uwplse/bril?rev=a48c5e18575aa738e8d08ff483ee23d6c2735107)", "dot-structures", "egglog", "egraph-serialize", @@ -622,7 +617,7 @@ checksum = "675e35c02a51bb4d4618cb4885b3839ce6d1787c97b664474d9208d074742e20" name = "eggcc" version = "0.1.0" dependencies = [ - "bril-rs 0.1.0", + "bril-rs 0.1.0 (git+https://github.com/uwplse/bril?rev=a48c5e18575aa738e8d08ff483ee23d6c2735107)", "bril2json", "brilift", "brilirs", @@ -1575,8 +1570,9 @@ dependencies = [ [[package]] name = "rs2bril" version = "0.1.0" +source = "git+https://github.com/uwplse/bril?rev=a48c5e18575aa738e8d08ff483ee23d6c2735107#a48c5e18575aa738e8d08ff483ee23d6c2735107" dependencies = [ - "bril-rs 0.1.0", + "bril-rs 0.1.0 (git+https://github.com/uwplse/bril?rev=a48c5e18575aa738e8d08ff483ee23d6c2735107)", "clap", "proc-macro2", "syn 2.0.66", diff --git a/Cargo.toml b/Cargo.toml index b9345e8e..fc9520b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,15 +22,14 @@ smallvec = "1.11.1" syn = { version = "2.0", features = ["full", "extra-traits"] } # currently using the uwplse/bril fork of bril, on eggcc-main -bril2json = { path = "../bril/bril-rs/bril2json" } -brilirs = { path = "../bril/brilirs" } -bril-rs = { path = "../bril/bril-rs" } -brilift = { path = "../bril/brilift" } -rs2bril = { path = "../bril/bril-rs/rs2bril",features = [ +bril2json = { git = "https://github.com/uwplse/bril", rev = "a48c5e18575aa738e8d08ff483ee23d6c2735107" } +brilirs = { git = "https://github.com/uwplse/bril", rev = "a48c5e18575aa738e8d08ff483ee23d6c2735107" } +bril-rs = { git = "https://github.com/uwplse/bril", rev = "a48c5e18575aa738e8d08ff483ee23d6c2735107" } +brilift = { git = "https://github.com/uwplse/bril", rev = "a48c5e18575aa738e8d08ff483ee23d6c2735107" } +rs2bril = { git = "https://github.com/uwplse/bril", rev = "a48c5e18575aa738e8d08ff483ee23d6c2735107" ,features = [ "import", ] } -brillvm = { path = "../bril/bril-rs/brillvm" } - +brillvm = { git = "https://github.com/uwplse/bril", rev = "a48c5e18575aa738e8d08ff483ee23d6c2735107" } ordered-float = { version = "3.7" } serde_json = "1.0.103" diff --git a/dag_in_context/Cargo.toml b/dag_in_context/Cargo.toml index e2e1ad1b..03389e5e 100644 --- a/dag_in_context/Cargo.toml +++ b/dag_in_context/Cargo.toml @@ -12,7 +12,7 @@ strum_macros = "0.25" main_error = "0.1.2" thiserror = "1.0" egraph-serialize = "0.2.0" -bril-rs = { git = "https://github.com/uwplse/bril", rev = "7ac4c001115aee8e39e7e0e5ad6e23bdb9c0ab76" } +bril-rs = { git = "https://github.com/uwplse/bril", rev = "a48c5e18575aa738e8d08ff483ee23d6c2735107" } indexmap = "2.0.0" rustc-hash = "1.1.0" ordered-float = "3"