From b9c0c2abb79769852119dc9a595e63ee74eeba03 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sat, 20 Apr 2019 12:34:36 +0200 Subject: Chalk integration - add proper canonicalization logic - add conversions from/to Chalk IR --- crates/ra_hir/Cargo.toml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'crates/ra_hir/Cargo.toml') diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index a2858dad9..ae7e7df62 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml @@ -19,7 +19,14 @@ ra_db = { path = "../ra_db" } mbe = { path = "../ra_mbe", package = "ra_mbe" } tt = { path = "../ra_tt", package = "ra_tt" } test_utils = { path = "../test_utils" } -ra_prof = {path = "../ra_prof" } +ra_prof = { path = "../ra_prof" } + +# chalk-solve = { git = "https://github.com/rust-lang/chalk.git" } +# chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git" } +# chalk-ir = { git = "https://github.com/rust-lang/chalk.git" } +chalk-solve = { git = "https://github.com/detrumi/chalk.git", branch = "program_clauses_that_could_match" } +chalk-rust-ir = { git = "https://github.com/detrumi/chalk.git", branch = "program_clauses_that_could_match" } +chalk-ir = { git = "https://github.com/detrumi/chalk.git", branch = "program_clauses_that_could_match" } [dev-dependencies] flexi_logger = "0.11.0" -- cgit v1.2.3 From 0bcf47b22b01f66c2f2056f5871e32071ba95b01 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Wed, 1 May 2019 23:26:42 +0200 Subject: Update Chalk --- crates/ra_hir/Cargo.toml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'crates/ra_hir/Cargo.toml') diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index ae7e7df62..68ffcb2e9 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml @@ -21,12 +21,9 @@ tt = { path = "../ra_tt", package = "ra_tt" } test_utils = { path = "../test_utils" } ra_prof = { path = "../ra_prof" } -# chalk-solve = { git = "https://github.com/rust-lang/chalk.git" } -# chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git" } -# chalk-ir = { git = "https://github.com/rust-lang/chalk.git" } -chalk-solve = { git = "https://github.com/detrumi/chalk.git", branch = "program_clauses_that_could_match" } -chalk-rust-ir = { git = "https://github.com/detrumi/chalk.git", branch = "program_clauses_that_could_match" } -chalk-ir = { git = "https://github.com/detrumi/chalk.git", branch = "program_clauses_that_could_match" } +chalk-solve = { git = "https://github.com/rust-lang/chalk.git" } +chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git" } +chalk-ir = { git = "https://github.com/rust-lang/chalk.git" } [dev-dependencies] flexi_logger = "0.11.0" -- cgit v1.2.3