From 0a7ef0933130b8293b09b57382fd61e3d7c46c69 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 26 Nov 2019 11:45:12 +0300 Subject: Use chalk fork to paper over #2052 --- crates/ra_hir/Cargo.toml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'crates/ra_hir/Cargo.toml') diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index 42ddfecc9..f72574485 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml @@ -26,9 +26,11 @@ hir_def = { path = "../ra_hir_def", package = "ra_hir_def" } test_utils = { path = "../test_utils" } ra_prof = { path = "../ra_prof" } -chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev = "a88cad7f0a69e05ba8f40b74c58a1c229c1b2478" } -chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "a88cad7f0a69e05ba8f40b74c58a1c229c1b2478" } -chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "a88cad7f0a69e05ba8f40b74c58a1c229c1b2478" } +# https://github.com/rust-lang/chalk/pull/294 +chalk-solve = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } +chalk-rust-ir = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } +chalk-ir = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } + lalrpop-intern = "0.15.1" [dev-dependencies] -- cgit v1.2.3 From 4c43631829d8bac8b7533c994d8cf1241a95ce70 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 26 Nov 2019 14:35:23 +0300 Subject: Introduce hir_ty --- crates/ra_hir/Cargo.toml | 1 + 1 file changed, 1 insertion(+) (limited to 'crates/ra_hir/Cargo.toml') diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index f72574485..23c056e90 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml @@ -23,6 +23,7 @@ mbe = { path = "../ra_mbe", package = "ra_mbe" } tt = { path = "../ra_tt", package = "ra_tt" } hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" } hir_def = { path = "../ra_hir_def", package = "ra_hir_def" } +hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" } test_utils = { path = "../test_utils" } ra_prof = { path = "../ra_prof" } -- cgit v1.2.3 From 8b1f2cd14eded9c2e37f6969a755541f843552b5 Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Tue, 26 Nov 2019 07:29:28 -0500 Subject: Update parking_lot and smallvec to drop some dependencies --- crates/ra_hir/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_hir/Cargo.toml') diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index f72574485..16bd4bafc 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml @@ -11,7 +11,7 @@ doctest = false arrayvec = "0.5.1" log = "0.4.5" rustc-hash = "1.0" -parking_lot = "0.9.0" +parking_lot = "0.10.0" ena = "0.13" once_cell = "1.0.1" -- cgit v1.2.3 From 47ec2ceb12df756b3482ddd2b1947e4b38f23706 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 27 Nov 2019 21:23:31 +0300 Subject: prune deps --- crates/ra_hir/Cargo.toml | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'crates/ra_hir/Cargo.toml') diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index caba85a4f..e79361e7c 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml @@ -8,31 +8,11 @@ authors = ["rust-analyzer developers"] doctest = false [dependencies] -arrayvec = "0.5.1" log = "0.4.5" rustc-hash = "1.0" -parking_lot = "0.10.0" -ena = "0.13" -once_cell = "1.0.1" ra_syntax = { path = "../ra_syntax" } -ra_arena = { path = "../ra_arena" } -ra_cfg = { path = "../ra_cfg" } ra_db = { path = "../ra_db" } -mbe = { path = "../ra_mbe", package = "ra_mbe" } -tt = { path = "../ra_tt", package = "ra_tt" } hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" } hir_def = { path = "../ra_hir_def", package = "ra_hir_def" } hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" } -test_utils = { path = "../test_utils" } -ra_prof = { path = "../ra_prof" } - -# https://github.com/rust-lang/chalk/pull/294 -chalk-solve = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } -chalk-rust-ir = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } -chalk-ir = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } - -lalrpop-intern = "0.15.1" - -[dev-dependencies] -insta = "0.12.0" -- cgit v1.2.3