Update Chalk

author: Florian Diebold <[email protected]> 2019-05-01 22:26:42 +0100
committer: Florian Diebold <[email protected]> 2019-05-04 17:18:30 +0100
commit: 0bcf47b22b01f66c2f2056f5871e32071ba95b01 (patch)
tree: 725e7b508affd7c810a4459495065ac3ecff5285 /Cargo.lock
parent: 0f34568924019caf1ed63c84143c12156b963abf (diff)
1 files changed, 23 insertions, 23 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 0bb62cb88..98c349dec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -146,9 +146,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "chalk-engine"
 version = "0.9.0"
-source = "git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match#b508031b92c754a677d46236aae1dcd2fa2fd68a"
+source = "git+https://github.com/rust-lang/chalk.git#17fb07e43b23d721f9c1adba289eac71b25f38ef"
 dependencies = [
- "chalk-macros 0.1.1 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",
+ "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
 "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)",
 ]
@@ -156,17 +156,17 @@ dependencies = [
 [[package]]
 name = "chalk-ir"
 version = "0.1.0"
-source = "git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match#b508031b92c754a677d46236aae1dcd2fa2fd68a"
+source = "git+https://github.com/rust-lang/chalk.git#17fb07e43b23d721f9c1adba289eac71b25f38ef"
 dependencies = [
- "chalk-engine 0.9.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",
+ "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
- "chalk-macros 0.1.1 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",
+ "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
 "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/detrumi/chalk.git?branch=program_clauses_that_could_match#b508031b92c754a677d46236aae1dcd2fa2fd68a"
+source = "git+https://github.com/rust-lang/chalk.git#17fb07e43b23d721f9c1adba289eac71b25f38ef"
 dependencies = [
 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -174,22 +174,22 @@ dependencies = [
 [[package]]
 name = "chalk-rust-ir"
 version = "0.1.0"
-source = "git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match#b508031b92c754a677d46236aae1dcd2fa2fd68a"
+source = "git+https://github.com/rust-lang/chalk.git#17fb07e43b23d721f9c1adba289eac71b25f38ef"
 dependencies = [
- "chalk-engine 0.9.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",
+ "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
- "chalk-ir 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",
+ "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
- "chalk-macros 0.1.1 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",
+ "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
 ]
 [[package]]
 name = "chalk-solve"
 version = "0.1.0"
-source = "git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match#b508031b92c754a677d46236aae1dcd2fa2fd68a"
+source = "git+https://github.com/rust-lang/chalk.git#17fb07e43b23d721f9c1adba289eac71b25f38ef"
 dependencies = [
- "chalk-engine 0.9.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",
+ "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
- "chalk-ir 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",
+ "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
- "chalk-macros 0.1.1 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",
+ "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
- "chalk-rust-ir 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",
+ "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
 "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)",
@@ -1074,9 +1074,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/detrumi/chalk.git?branch=program_clauses_that_could_match)",
+ "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
- "chalk-rust-ir 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",
+ "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
- "chalk-solve 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",
+ "chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
 "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.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1997,11 +1997,11 @@ dependencies = [
 "checksum cargo_metadata 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "178d62b240c34223f265a4c1e275e37d62da163d421fc8d7f7e3ee340f803c57"
 "checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83"
 "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/detrumi/chalk.git?branch=program_clauses_that_could_match)" = "<none>"
+"checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
-"checksum chalk-ir 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)" = "<none>"
+"checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
-"checksum chalk-macros 0.1.1 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)" = "<none>"
+"checksum chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
-"checksum chalk-rust-ir 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)" = "<none>"
+"checksum chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
-"checksum chalk-solve 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)" = "<none>"
+"checksum chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<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-01 22:26:42 +0100
committer	Florian Diebold <[email protected]>	2019-05-04 17:18:30 +0100
commit	0bcf47b22b01f66c2f2056f5871e32071ba95b01 (patch)
tree	725e7b508affd7c810a4459495065ac3ecff5285 /Cargo.lock
parent	0f34568924019caf1ed63c84143c12156b963abf (diff)

diff --git a/Cargo.lock b/Cargo.lock index 0bb62cb88..98c349dec 100644 --- a/Cargo.lock +++ b/Cargo.lock
@@ -146,9 +146,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
146	[[package]]	146	[[package]]
147	name = "chalk-engine"	147	name = "chalk-engine"
148	version = "0.9.0"	148	version = "0.9.0"
149	source = "git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match#b508031b92c754a677d46236aae1dcd2fa2fd68a"	149	source = "git+https://github.com/rust-lang/chalk.git#17fb07e43b23d721f9c1adba289eac71b25f38ef"
150	dependencies = [	150	dependencies = [
151	"chalk-macros 0.1.1 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",	151	"chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
152	"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",	152	"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
153	"stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",	153	"stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
154	]	154	]
@@ -156,17 +156,17 @@ dependencies = [
156	[[package]]	156	[[package]]
157	name = "chalk-ir"	157	name = "chalk-ir"
158	version = "0.1.0"	158	version = "0.1.0"
159	source = "git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match#b508031b92c754a677d46236aae1dcd2fa2fd68a"	159	source = "git+https://github.com/rust-lang/chalk.git#17fb07e43b23d721f9c1adba289eac71b25f38ef"
160	dependencies = [	160	dependencies = [
161	"chalk-engine 0.9.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",	161	"chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
162	"chalk-macros 0.1.1 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",	162	"chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
163	"lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",	163	"lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
164	]	164	]
165		165
166	[[package]]	166	[[package]]
167	name = "chalk-macros"	167	name = "chalk-macros"
168	version = "0.1.1"	168	version = "0.1.1"
169	source = "git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match#b508031b92c754a677d46236aae1dcd2fa2fd68a"	169	source = "git+https://github.com/rust-lang/chalk.git#17fb07e43b23d721f9c1adba289eac71b25f38ef"
170	dependencies = [	170	dependencies = [
171	"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",	171	"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
172	]	172	]
@@ -174,22 +174,22 @@ dependencies = [
174	[[package]]	174	[[package]]
175	name = "chalk-rust-ir"	175	name = "chalk-rust-ir"
176	version = "0.1.0"	176	version = "0.1.0"
177	source = "git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match#b508031b92c754a677d46236aae1dcd2fa2fd68a"	177	source = "git+https://github.com/rust-lang/chalk.git#17fb07e43b23d721f9c1adba289eac71b25f38ef"
178	dependencies = [	178	dependencies = [
179	"chalk-engine 0.9.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",	179	"chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
180	"chalk-ir 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",	180	"chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
181	"chalk-macros 0.1.1 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",	181	"chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
182	]	182	]
183		183
184	[[package]]	184	[[package]]
185	name = "chalk-solve"	185	name = "chalk-solve"
186	version = "0.1.0"	186	version = "0.1.0"
187	source = "git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match#b508031b92c754a677d46236aae1dcd2fa2fd68a"	187	source = "git+https://github.com/rust-lang/chalk.git#17fb07e43b23d721f9c1adba289eac71b25f38ef"
188	dependencies = [	188	dependencies = [
189	"chalk-engine 0.9.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",	189	"chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
190	"chalk-ir 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",	190	"chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
191	"chalk-macros 0.1.1 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",	191	"chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
192	"chalk-rust-ir 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",	192	"chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
193	"derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",	193	"derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
194	"ena 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",	194	"ena 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
195	"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",	195	"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1074,9 +1074,9 @@ name = "ra_hir"
1074	version = "0.1.0"	1074	version = "0.1.0"
1075	dependencies = [	1075	dependencies = [
1076	"arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",	1076	"arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
1077	"chalk-ir 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",	1077	"chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
1078	"chalk-rust-ir 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",	1078	"chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
1079	"chalk-solve 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)",	1079	"chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
1080	"ena 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",	1080	"ena 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
1081	"flexi_logger 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)",	1081	"flexi_logger 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)",
1082	"insta 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",	1082	"insta 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1997,11 +1997,11 @@ dependencies = [
1997	"checksum cargo_metadata 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "178d62b240c34223f265a4c1e275e37d62da163d421fc8d7f7e3ee340f803c57"	1997	"checksum cargo_metadata 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "178d62b240c34223f265a4c1e275e37d62da163d421fc8d7f7e3ee340f803c57"
1998	"checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83"	1998	"checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83"
1999	"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"	1999	"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"
2000	"checksum chalk-engine 0.9.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)" = "<none>"	2000	"checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
2001	"checksum chalk-ir 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)" = "<none>"	2001	"checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
2002	"checksum chalk-macros 0.1.1 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)" = "<none>"	2002	"checksum chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
2003	"checksum chalk-rust-ir 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)" = "<none>"	2003	"checksum chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
2004	"checksum chalk-solve 0.1.0 (git+https://github.com/detrumi/chalk.git?branch=program_clauses_that_could_match)" = "<none>"	2004	"checksum chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
2005	"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"	2005	"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
2006	"checksum ci_info 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5e881307a989a3a5e20d52a32cc05950e3c2178cccfcc9428271a6cde09f902"	2006	"checksum ci_info 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5e881307a989a3a5e20d52a32cc05950e3c2178cccfcc9428271a6cde09f902"
2007	"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"	2007	"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"