aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-03-08 15:40:48 +0000
committerGitHub <[email protected]>2021-03-08 15:40:48 +0000
commitf2b8df17db254342eb17e8ac8df9e81e8b34775c (patch)
tree56f5c59a053aa3936257a53e852ed22d810acf75
parent64e95eee3aa99ac500f9ca4fd8643caee6bf80bb (diff)
parente13ac349b52993a7addb4643ba24a7fe378c0f2f (diff)
Merge #7920
7920: Cargo update r=kjeremy a=kjeremy Chalk changes just a version # bump. There are no actual commits. Co-authored-by: kjeremy <[email protected]>
-rw-r--r--Cargo.lock51
-rw-r--r--crates/hir_ty/Cargo.toml6
2 files changed, 24 insertions, 33 deletions
diff --git a/Cargo.lock b/Cargo.lock
index c392a8907..7335eb911 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -168,9 +168,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
168 168
169[[package]] 169[[package]]
170name = "chalk-derive" 170name = "chalk-derive"
171version = "0.59.0" 171version = "0.60.0"
172source = "registry+https://github.com/rust-lang/crates.io-index" 172source = "registry+https://github.com/rust-lang/crates.io-index"
173checksum = "4b9000fbcb67353dc8973ab9fd136277d321d85b79bd36b8756bb3ae0979a94a" 173checksum = "ab0f74445d4fbeaf0217bc1d23978cc73b95b28e8a738b81894580dd646822d2"
174dependencies = [ 174dependencies = [
175 "proc-macro2", 175 "proc-macro2",
176 "quote", 176 "quote",
@@ -180,9 +180,9 @@ dependencies = [
180 180
181[[package]] 181[[package]]
182name = "chalk-ir" 182name = "chalk-ir"
183version = "0.59.0" 183version = "0.60.0"
184source = "registry+https://github.com/rust-lang/crates.io-index" 184source = "registry+https://github.com/rust-lang/crates.io-index"
185checksum = "b23528d61b3557c676eccf508fa0771a38453b379f0b780154eaa7f70afe8dfc" 185checksum = "294b1fc6210a5b3bd06c1d01dda48a581e2cafec80b8d659139ce45456644be2"
186dependencies = [ 186dependencies = [
187 "bitflags", 187 "bitflags",
188 "chalk-derive", 188 "chalk-derive",
@@ -191,9 +191,9 @@ dependencies = [
191 191
192[[package]] 192[[package]]
193name = "chalk-recursive" 193name = "chalk-recursive"
194version = "0.59.0" 194version = "0.60.0"
195source = "registry+https://github.com/rust-lang/crates.io-index" 195source = "registry+https://github.com/rust-lang/crates.io-index"
196checksum = "a8bdd37afc666b771de8b4429fe014363d0e74aae5cc26f320f60a3eab34d744" 196checksum = "1b9386936070be4545bfa22b094b7065af79aa2aeaccc945438f1c5ffe74c30a"
197dependencies = [ 197dependencies = [
198 "chalk-derive", 198 "chalk-derive",
199 "chalk-ir", 199 "chalk-ir",
@@ -204,9 +204,9 @@ dependencies = [
204 204
205[[package]] 205[[package]]
206name = "chalk-solve" 206name = "chalk-solve"
207version = "0.59.0" 207version = "0.60.0"
208source = "registry+https://github.com/rust-lang/crates.io-index" 208source = "registry+https://github.com/rust-lang/crates.io-index"
209checksum = "4182c42ca319cb71c89898ebc3d2671d1fa7d928123b171b66f1797a2000b9c8" 209checksum = "7c12a1ec7e850b50a049f27ef9cf5df3056bbd1acbb3eeb44d024e501a641f3a"
210dependencies = [ 210dependencies = [
211 "chalk-derive", 211 "chalk-derive",
212 "chalk-ir", 212 "chalk-ir",
@@ -232,15 +232,6 @@ dependencies = [
232] 232]
233 233
234[[package]] 234[[package]]
235name = "cmake"
236version = "0.1.45"
237source = "registry+https://github.com/rust-lang/crates.io-index"
238checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855"
239dependencies = [
240 "cc",
241]
242
243[[package]]
244name = "countme" 235name = "countme"
245version = "2.0.4" 236version = "2.0.4"
246source = "registry+https://github.com/rust-lang/crates.io-index" 237source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -687,9 +678,9 @@ dependencies = [
687 678
688[[package]] 679[[package]]
689name = "indexmap" 680name = "indexmap"
690version = "1.6.1" 681version = "1.6.2"
691source = "registry+https://github.com/rust-lang/crates.io-index" 682source = "registry+https://github.com/rust-lang/crates.io-index"
692checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" 683checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
693dependencies = [ 684dependencies = [
694 "autocfg", 685 "autocfg",
695 "hashbrown", 686 "hashbrown",
@@ -805,11 +796,11 @@ dependencies = [
805 796
806[[package]] 797[[package]]
807name = "libmimalloc-sys" 798name = "libmimalloc-sys"
808version = "0.1.20" 799version = "0.1.21"
809source = "registry+https://github.com/rust-lang/crates.io-index" 800source = "registry+https://github.com/rust-lang/crates.io-index"
810checksum = "e58f42b6424a0ed536678c65fd97cd64b4344bcf86251e284f7c0ce9eee40e64" 801checksum = "2396cf99d2f58611cd69f0efeee4af3d2e2c7b61bed433515029163aa567e65c"
811dependencies = [ 802dependencies = [
812 "cmake", 803 "cc",
813] 804]
814 805
815[[package]] 806[[package]]
@@ -911,9 +902,9 @@ dependencies = [
911 902
912[[package]] 903[[package]]
913name = "mimalloc" 904name = "mimalloc"
914version = "0.1.24" 905version = "0.1.25"
915source = "registry+https://github.com/rust-lang/crates.io-index" 906source = "registry+https://github.com/rust-lang/crates.io-index"
916checksum = "757efec188b3d2088949d912e01ea2fe87164ed6376b6c5d7dd4f3ce1668a93d" 907checksum = "1e7c6b11afd1e5e689ac96b6d18b1fc763398fe3d7eed99e8773426bc2033dfb"
917dependencies = [ 908dependencies = [
918 "libmimalloc-sys", 909 "libmimalloc-sys",
919] 910]
@@ -1466,18 +1457,18 @@ dependencies = [
1466 1457
1467[[package]] 1458[[package]]
1468name = "serde" 1459name = "serde"
1469version = "1.0.123" 1460version = "1.0.124"
1470source = "registry+https://github.com/rust-lang/crates.io-index" 1461source = "registry+https://github.com/rust-lang/crates.io-index"
1471checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" 1462checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f"
1472dependencies = [ 1463dependencies = [
1473 "serde_derive", 1464 "serde_derive",
1474] 1465]
1475 1466
1476[[package]] 1467[[package]]
1477name = "serde_derive" 1468name = "serde_derive"
1478version = "1.0.123" 1469version = "1.0.124"
1479source = "registry+https://github.com/rust-lang/crates.io-index" 1470source = "registry+https://github.com/rust-lang/crates.io-index"
1480checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" 1471checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b"
1481dependencies = [ 1472dependencies = [
1482 "proc-macro2", 1473 "proc-macro2",
1483 "quote", 1474 "quote",
@@ -1561,9 +1552,9 @@ dependencies = [
1561 1552
1562[[package]] 1553[[package]]
1563name = "syn" 1554name = "syn"
1564version = "1.0.61" 1555version = "1.0.62"
1565source = "registry+https://github.com/rust-lang/crates.io-index" 1556source = "registry+https://github.com/rust-lang/crates.io-index"
1566checksum = "ed22b90a0e734a23a7610f4283ac9e5acfb96cbb30dfefa540d66f866f1c09c5" 1557checksum = "123a78a3596b24fee53a6464ce52d8ecbf62241e6294c7e7fe12086cd161f512"
1567dependencies = [ 1558dependencies = [
1568 "proc-macro2", 1559 "proc-macro2",
1569 "quote", 1560 "quote",
diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml
index d1302d749..1127eef05 100644
--- a/crates/hir_ty/Cargo.toml
+++ b/crates/hir_ty/Cargo.toml
@@ -17,9 +17,9 @@ ena = "0.14.0"
17log = "0.4.8" 17log = "0.4.8"
18rustc-hash = "1.1.0" 18rustc-hash = "1.1.0"
19scoped-tls = "1" 19scoped-tls = "1"
20chalk-solve = { version = "0.59", default-features = false } 20chalk-solve = { version = "0.60", default-features = false }
21chalk-ir = "0.59" 21chalk-ir = "0.60"
22chalk-recursive = "0.59" 22chalk-recursive = "0.60"
23la-arena = { version = "0.2.0", path = "../../lib/arena" } 23la-arena = { version = "0.2.0", path = "../../lib/arena" }
24 24
25stdx = { path = "../stdx", version = "0.0.0" } 25stdx = { path = "../stdx", version = "0.0.0" }