aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock46
-rw-r--r--crates/ra_hir/Cargo.toml6
-rw-r--r--crates/ra_hir/src/ty/traits.rs2
3 files changed, 27 insertions, 27 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 1e455e13c..dd6dade6c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -161,9 +161,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
161[[package]] 161[[package]]
162name = "chalk-engine" 162name = "chalk-engine"
163version = "0.9.0" 163version = "0.9.0"
164source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#d42a5bfe0d31d1e18505e4967be6649961578064" 164source = "git+https://github.com/rust-lang/chalk.git#201775c47e4cefeb71d7f415c605e09c02e33b22"
165dependencies = [ 165dependencies = [
166 "chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 166 "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
167 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 167 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
168 "stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 168 "stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
169] 169]
@@ -171,17 +171,17 @@ dependencies = [
171[[package]] 171[[package]]
172name = "chalk-ir" 172name = "chalk-ir"
173version = "0.1.0" 173version = "0.1.0"
174source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#d42a5bfe0d31d1e18505e4967be6649961578064" 174source = "git+https://github.com/rust-lang/chalk.git#201775c47e4cefeb71d7f415c605e09c02e33b22"
175dependencies = [ 175dependencies = [
176 "chalk-engine 0.9.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 176 "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
177 "chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 177 "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
178 "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", 178 "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
179] 179]
180 180
181[[package]] 181[[package]]
182name = "chalk-macros" 182name = "chalk-macros"
183version = "0.1.1" 183version = "0.1.1"
184source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#d42a5bfe0d31d1e18505e4967be6649961578064" 184source = "git+https://github.com/rust-lang/chalk.git#201775c47e4cefeb71d7f415c605e09c02e33b22"
185dependencies = [ 185dependencies = [
186 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", 186 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
187] 187]
@@ -189,22 +189,22 @@ dependencies = [
189[[package]] 189[[package]]
190name = "chalk-rust-ir" 190name = "chalk-rust-ir"
191version = "0.1.0" 191version = "0.1.0"
192source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#d42a5bfe0d31d1e18505e4967be6649961578064" 192source = "git+https://github.com/rust-lang/chalk.git#201775c47e4cefeb71d7f415c605e09c02e33b22"
193dependencies = [ 193dependencies = [
194 "chalk-engine 0.9.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 194 "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
195 "chalk-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 195 "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
196 "chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 196 "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
197] 197]
198 198
199[[package]] 199[[package]]
200name = "chalk-solve" 200name = "chalk-solve"
201version = "0.1.0" 201version = "0.1.0"
202source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#d42a5bfe0d31d1e18505e4967be6649961578064" 202source = "git+https://github.com/rust-lang/chalk.git#201775c47e4cefeb71d7f415c605e09c02e33b22"
203dependencies = [ 203dependencies = [
204 "chalk-engine 0.9.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 204 "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
205 "chalk-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 205 "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
206 "chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 206 "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
207 "chalk-rust-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 207 "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
208 "derive-new 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", 208 "derive-new 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
209 "ena 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", 209 "ena 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
210 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 210 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1157,9 +1157,9 @@ name = "ra_hir"
1157version = "0.1.0" 1157version = "0.1.0"
1158dependencies = [ 1158dependencies = [
1159 "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", 1159 "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
1160 "chalk-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 1160 "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
1161 "chalk-rust-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 1161 "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
1162 "chalk-solve 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 1162 "chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
1163 "ena 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", 1163 "ena 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
1164 "insta 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", 1164 "insta 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
1165 "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", 1165 "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2110,11 +2110,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2110"checksum cargo_metadata 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "929766d993a2fde7a0ae962ee82429069cd7b68839cd9375b98efd719df65d3a" 2110"checksum cargo_metadata 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "929766d993a2fde7a0ae962ee82429069cd7b68839cd9375b98efd719df65d3a"
2111"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" 2111"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d"
2112"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" 2112"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
2113"checksum chalk-engine 0.9.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>" 2113"checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
2114"checksum chalk-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>" 2114"checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
2115"checksum chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>" 2115"checksum chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
2116"checksum chalk-rust-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>" 2116"checksum chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
2117"checksum chalk-solve 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>" 2117"checksum chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
2118"checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe" 2118"checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe"
2119"checksum ci_info 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5e881307a989a3a5e20d52a32cc05950e3c2178cccfcc9428271a6cde09f902" 2119"checksum ci_info 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5e881307a989a3a5e20d52a32cc05950e3c2178cccfcc9428271a6cde09f902"
2120"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" 2120"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index de2c2dbec..833956ce8 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -21,9 +21,9 @@ tt = { path = "../ra_tt", package = "ra_tt" }
21test_utils = { path = "../test_utils" } 21test_utils = { path = "../test_utils" }
22ra_prof = { path = "../ra_prof" } 22ra_prof = { path = "../ra_prof" }
23 23
24chalk-solve = { git = "https://github.com/flodiebold/chalk.git", branch = "fuel" } 24chalk-solve = { git = "https://github.com/rust-lang/chalk.git" }
25chalk-rust-ir = { git = "https://github.com/flodiebold/chalk.git", branch = "fuel" } 25chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git" }
26chalk-ir = { git = "https://github.com/flodiebold/chalk.git", branch = "fuel" } 26chalk-ir = { git = "https://github.com/rust-lang/chalk.git" }
27lalrpop-intern = "0.15.1" 27lalrpop-intern = "0.15.1"
28 28
29[dev-dependencies] 29[dev-dependencies]
diff --git a/crates/ra_hir/src/ty/traits.rs b/crates/ra_hir/src/ty/traits.rs
index 7dccd93be..0769e6e17 100644
--- a/crates/ra_hir/src/ty/traits.rs
+++ b/crates/ra_hir/src/ty/traits.rs
@@ -62,7 +62,7 @@ fn solve(
62 let context = ChalkContext { db, krate }; 62 let context = ChalkContext { db, krate };
63 let solver = db.trait_solver(krate); 63 let solver = db.trait_solver(krate);
64 debug!("solve goal: {:?}", goal); 64 debug!("solve goal: {:?}", goal);
65 let solution = solver.lock().solve_with_fuel(&context, goal, Some(1000)); 65 let solution = solver.lock().solve(&context, goal);
66 debug!("solve({:?}) => {:?}", goal, solution); 66 debug!("solve({:?}) => {:?}", goal, solution);
67 solution 67 solution
68} 68}