Use fuel branch for Chalk

This makes sure we don't take too long in trait solving.
author: Florian Diebold <[email protected]> 2019-05-20 17:31:12 +0100
committer: Florian Diebold <[email protected]> 2019-05-21 19:40:29 +0100
commit: f613c48d2e2afa1761623d186d11c1719f9ef3f7 (patch)
tree: 1ff623537505695163ea329d9eae35325eb2ef21 /Cargo.lock
parent: ed943adb29e6eddb482377a21908a8ed66c6cc21 (diff)
1 files changed, 23 insertions, 23 deletions
diff --git a/Cargo.lock b/Cargo.lock
index d8ada0757..8dd894802 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -141,9 +141,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "chalk-engine"
 version = "0.9.0"
-source = "git+https://github.com/rust-lang/chalk.git#b92c15327f1d336fec7573c7de323ab247cca386"
+source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#fba97af88ff2e0266db12490e2baf47d17e557e3"
 dependencies = [
- "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
+ "chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -151,17 +151,17 @@ dependencies = [
 [[package]]
 name = "chalk-ir"
 version = "0.1.0"
-source = "git+https://github.com/rust-lang/chalk.git#b92c15327f1d336fec7573c7de323ab247cca386"
+source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#fba97af88ff2e0266db12490e2baf47d17e557e3"
 dependencies = [
- "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
+ "chalk-engine 0.9.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
- "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
+ "chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
 "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "chalk-macros"
 version = "0.1.1"
-source = "git+https://github.com/rust-lang/chalk.git#b92c15327f1d336fec7573c7de323ab247cca386"
+source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#fba97af88ff2e0266db12490e2baf47d17e557e3"
 dependencies = [
 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -169,22 +169,22 @@ dependencies = [
 [[package]]
 name = "chalk-rust-ir"
 version = "0.1.0"
-source = "git+https://github.com/rust-lang/chalk.git#b92c15327f1d336fec7573c7de323ab247cca386"
+source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#fba97af88ff2e0266db12490e2baf47d17e557e3"
 dependencies = [
- "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
+ "chalk-engine 0.9.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
- "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
+ "chalk-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
- "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
+ "chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
 ]
 [[package]]
 name = "chalk-solve"
 version = "0.1.0"
-source = "git+https://github.com/rust-lang/chalk.git#b92c15327f1d336fec7573c7de323ab247cca386"
+source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#fba97af88ff2e0266db12490e2baf47d17e557e3"
 dependencies = [
- "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
+ "chalk-engine 0.9.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
- "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
+ "chalk-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
- "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
+ "chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
- "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
+ "chalk-rust-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "ena 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1109,9 +1109,9 @@ name = "ra_hir"
 version = "0.1.0"
 dependencies = [
 "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
+ "chalk-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
- "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
+ "chalk-rust-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
- "chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
+ "chalk-solve 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
 "ena 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "flexi_logger 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "insta 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2036,11 +2036,11 @@ dependencies = [
 "checksum cargo_metadata 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "178d62b240c34223f265a4c1e275e37d62da163d421fc8d7f7e3ee340f803c57"
 "checksum cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "a0c56216487bb80eec9c4516337b2588a4f2a2290d72a1416d930e4dcdb0c90d"
 "checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"
-"checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
+"checksum chalk-engine 0.9.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>"
-"checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
+"checksum chalk-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>"
-"checksum chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
+"checksum chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>"
-"checksum chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
+"checksum chalk-rust-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>"
-"checksum chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
+"checksum chalk-solve 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum ci_info 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5e881307a989a3a5e20d52a32cc05950e3c2178cccfcc9428271a6cde09f902"
 "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
author	Florian Diebold <[email protected]>	2019-05-20 17:31:12 +0100
committer	Florian Diebold <[email protected]>	2019-05-21 19:40:29 +0100
commit	f613c48d2e2afa1761623d186d11c1719f9ef3f7 (patch)
tree	1ff623537505695163ea329d9eae35325eb2ef21 /Cargo.lock
parent	ed943adb29e6eddb482377a21908a8ed66c6cc21 (diff)

diff --git a/Cargo.lock b/Cargo.lock index d8ada0757..8dd894802 100644 --- a/Cargo.lock +++ b/Cargo.lock
@@ -141,9 +141,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
141	[[package]]	141	[[package]]
142	name = "chalk-engine"	142	name = "chalk-engine"
143	version = "0.9.0"	143	version = "0.9.0"
144	source = "git+https://github.com/rust-lang/chalk.git#b92c15327f1d336fec7573c7de323ab247cca386"	144	source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#fba97af88ff2e0266db12490e2baf47d17e557e3"
145	dependencies = [	145	dependencies = [
146	"chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",	146	"chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
147	"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",	147	"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
148	"stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",	148	"stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
149	]	149	]
@@ -151,17 +151,17 @@ dependencies = [
151	[[package]]	151	[[package]]
152	name = "chalk-ir"	152	name = "chalk-ir"
153	version = "0.1.0"	153	version = "0.1.0"
154	source = "git+https://github.com/rust-lang/chalk.git#b92c15327f1d336fec7573c7de323ab247cca386"	154	source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#fba97af88ff2e0266db12490e2baf47d17e557e3"
155	dependencies = [	155	dependencies = [
156	"chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",	156	"chalk-engine 0.9.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
157	"chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",	157	"chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
158	"lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",	158	"lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
159	]	159	]
160		160
161	[[package]]	161	[[package]]
162	name = "chalk-macros"	162	name = "chalk-macros"
163	version = "0.1.1"	163	version = "0.1.1"
164	source = "git+https://github.com/rust-lang/chalk.git#b92c15327f1d336fec7573c7de323ab247cca386"	164	source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#fba97af88ff2e0266db12490e2baf47d17e557e3"
165	dependencies = [	165	dependencies = [
166	"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",	166	"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
167	]	167	]
@@ -169,22 +169,22 @@ dependencies = [
169	[[package]]	169	[[package]]
170	name = "chalk-rust-ir"	170	name = "chalk-rust-ir"
171	version = "0.1.0"	171	version = "0.1.0"
172	source = "git+https://github.com/rust-lang/chalk.git#b92c15327f1d336fec7573c7de323ab247cca386"	172	source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#fba97af88ff2e0266db12490e2baf47d17e557e3"
173	dependencies = [	173	dependencies = [
174	"chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",	174	"chalk-engine 0.9.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
175	"chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",	175	"chalk-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
176	"chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",	176	"chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
177	]	177	]
178		178
179	[[package]]	179	[[package]]
180	name = "chalk-solve"	180	name = "chalk-solve"
181	version = "0.1.0"	181	version = "0.1.0"
182	source = "git+https://github.com/rust-lang/chalk.git#b92c15327f1d336fec7573c7de323ab247cca386"	182	source = "git+https://github.com/flodiebold/chalk.git?branch=fuel#fba97af88ff2e0266db12490e2baf47d17e557e3"
183	dependencies = [	183	dependencies = [
184	"chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",	184	"chalk-engine 0.9.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
185	"chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",	185	"chalk-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
186	"chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",	186	"chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
187	"chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",	187	"chalk-rust-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
188	"derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",	188	"derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
189	"ena 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",	189	"ena 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
190	"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",	190	"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1109,9 +1109,9 @@ name = "ra_hir"
1109	version = "0.1.0"	1109	version = "0.1.0"
1110	dependencies = [	1110	dependencies = [
1111	"arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",	1111	"arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
1112	"chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",	1112	"chalk-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
1113	"chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",	1113	"chalk-rust-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
1114	"chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git)",	1114	"chalk-solve 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
1115	"ena 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",	1115	"ena 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
1116	"flexi_logger 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)",	1116	"flexi_logger 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)",
1117	"insta 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",	1117	"insta 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2036,11 +2036,11 @@ dependencies = [
2036	"checksum cargo_metadata 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "178d62b240c34223f265a4c1e275e37d62da163d421fc8d7f7e3ee340f803c57"	2036	"checksum cargo_metadata 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "178d62b240c34223f265a4c1e275e37d62da163d421fc8d7f7e3ee340f803c57"
2037	"checksum cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "a0c56216487bb80eec9c4516337b2588a4f2a2290d72a1416d930e4dcdb0c90d"	2037	"checksum cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "a0c56216487bb80eec9c4516337b2588a4f2a2290d72a1416d930e4dcdb0c90d"
2038	"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"	2038	"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"
2039	"checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"	2039	"checksum chalk-engine 0.9.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>"
2040	"checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"	2040	"checksum chalk-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>"
2041	"checksum chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)" = "<none>"	2041	"checksum chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>"
2042	"checksum chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"	2042	"checksum chalk-rust-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>"
2043	"checksum chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"	2043	"checksum chalk-solve 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>"
2044	"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"	2044	"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
2045	"checksum ci_info 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5e881307a989a3a5e20d52a32cc05950e3c2178cccfcc9428271a6cde09f902"	2045	"checksum ci_info 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5e881307a989a3a5e20d52a32cc05950e3c2178cccfcc9428271a6cde09f902"
2046	"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"	2046	"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"