aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-10-24 19:58:02 +0100
committerGitHub <[email protected]>2020-10-24 19:58:02 +0100
commit11e18c31df19d05438a373c26ad6cda487955b4d (patch)
treee41075a88416b2cfdb48985673f524a9ddd565f1
parentd5c294f78ca9c621e38b23102e3b5ca1bdd175f3 (diff)
parentc81d044622197a45878f3d015c181154dd12ed14 (diff)
Merge #6344
6344: Bump deps r=matklad a=lnicola Co-authored-by: LaurenČ›iu Nicola <[email protected]>
-rw-r--r--Cargo.lock142
-rw-r--r--crates/hir_ty/Cargo.toml6
-rw-r--r--crates/ide_db/Cargo.toml2
-rw-r--r--crates/rust-analyzer/Cargo.toml2
-rw-r--r--crates/syntax/Cargo.toml2
5 files changed, 102 insertions, 52 deletions
diff --git a/Cargo.lock b/Cargo.lock
index fe09e4afe..7d9b2f9c1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -42,9 +42,9 @@ version = "0.0.0"
42 42
43[[package]] 43[[package]]
44name = "arrayvec" 44name = "arrayvec"
45version = "0.5.1" 45version = "0.5.2"
46source = "registry+https://github.com/rust-lang/crates.io-index" 46source = "registry+https://github.com/rust-lang/crates.io-index"
47checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" 47checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
48 48
49[[package]] 49[[package]]
50name = "assists" 50name = "assists"
@@ -147,7 +147,7 @@ version = "0.12.0"
147source = "registry+https://github.com/rust-lang/crates.io-index" 147source = "registry+https://github.com/rust-lang/crates.io-index"
148checksum = "d5a5f7b42f606b7f23674f6f4d877628350682bc40687d3fae65679a58d55345" 148checksum = "d5a5f7b42f606b7f23674f6f4d877628350682bc40687d3fae65679a58d55345"
149dependencies = [ 149dependencies = [
150 "semver", 150 "semver 0.11.0",
151 "serde", 151 "serde",
152 "serde_json", 152 "serde_json",
153] 153]
@@ -183,9 +183,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
183 183
184[[package]] 184[[package]]
185name = "chalk-derive" 185name = "chalk-derive"
186version = "0.33.0" 186version = "0.34.0"
187source = "registry+https://github.com/rust-lang/crates.io-index" 187source = "registry+https://github.com/rust-lang/crates.io-index"
188checksum = "569014cab9084a6b826fe2507cc6d08f7897ba144fb1bc74e71b593dc8a0b952" 188checksum = "0e9f986750ecb4df889d0a95d4586bd921889497b33908cc75bb80eadb4c600a"
189dependencies = [ 189dependencies = [
190 "proc-macro2", 190 "proc-macro2",
191 "quote", 191 "quote",
@@ -195,9 +195,9 @@ dependencies = [
195 195
196[[package]] 196[[package]]
197name = "chalk-ir" 197name = "chalk-ir"
198version = "0.33.0" 198version = "0.34.0"
199source = "registry+https://github.com/rust-lang/crates.io-index" 199source = "registry+https://github.com/rust-lang/crates.io-index"
200checksum = "8d9eab2a6590b696419f89c9ca3616fe8e8266ef676e6a6da8818c94963c9541" 200checksum = "5c352c4649f1408bb3de5d86a248fda78d3d9cd1cbbd9502e7eca1be1e7ac368"
201dependencies = [ 201dependencies = [
202 "chalk-derive", 202 "chalk-derive",
203 "lazy_static", 203 "lazy_static",
@@ -205,9 +205,9 @@ dependencies = [
205 205
206[[package]] 206[[package]]
207name = "chalk-recursive" 207name = "chalk-recursive"
208version = "0.33.0" 208version = "0.34.0"
209source = "registry+https://github.com/rust-lang/crates.io-index" 209source = "registry+https://github.com/rust-lang/crates.io-index"
210checksum = "4a4671bcc70aa2d7e12ff4fe03f91d0c3c9ce387de915915e57fdf0c91dc5abd" 210checksum = "7294bb2ac5446fcb83ec9524b9113f59a8913f174a9c1dea6db60532f17a1579"
211dependencies = [ 211dependencies = [
212 "chalk-derive", 212 "chalk-derive",
213 "chalk-ir", 213 "chalk-ir",
@@ -218,9 +218,9 @@ dependencies = [
218 218
219[[package]] 219[[package]]
220name = "chalk-solve" 220name = "chalk-solve"
221version = "0.33.0" 221version = "0.34.0"
222source = "registry+https://github.com/rust-lang/crates.io-index" 222source = "registry+https://github.com/rust-lang/crates.io-index"
223checksum = "45f75cc603f2fd302576c8b2976437f334e159e26d0afbb108a565b96c52184e" 223checksum = "ffbca06963ed6f3d22faed840847a685f02feefa3825c0b94f9b791d03a0ac6f"
224dependencies = [ 224dependencies = [
225 "chalk-derive", 225 "chalk-derive",
226 "chalk-ir", 226 "chalk-ir",
@@ -292,11 +292,11 @@ checksum = "ce90df4c658c62f12d78f7508cf92f9173e5184a539c10bfe54a3107b3ffd0f2"
292 292
293[[package]] 293[[package]]
294name = "crc32fast" 294name = "crc32fast"
295version = "1.2.0" 295version = "1.2.1"
296source = "registry+https://github.com/rust-lang/crates.io-index" 296source = "registry+https://github.com/rust-lang/crates.io-index"
297checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" 297checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
298dependencies = [ 298dependencies = [
299 "cfg-if 0.1.10", 299 "cfg-if 1.0.0",
300] 300]
301 301
302[[package]] 302[[package]]
@@ -321,26 +321,25 @@ dependencies = [
321 321
322[[package]] 322[[package]]
323name = "crossbeam-deque" 323name = "crossbeam-deque"
324version = "0.7.3" 324version = "0.8.0"
325source = "registry+https://github.com/rust-lang/crates.io-index" 325source = "registry+https://github.com/rust-lang/crates.io-index"
326checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" 326checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
327dependencies = [ 327dependencies = [
328 "cfg-if 1.0.0",
328 "crossbeam-epoch", 329 "crossbeam-epoch",
329 "crossbeam-utils 0.7.2", 330 "crossbeam-utils 0.8.0",
330 "maybe-uninit",
331] 331]
332 332
333[[package]] 333[[package]]
334name = "crossbeam-epoch" 334name = "crossbeam-epoch"
335version = "0.8.2" 335version = "0.9.0"
336source = "registry+https://github.com/rust-lang/crates.io-index" 336source = "registry+https://github.com/rust-lang/crates.io-index"
337checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" 337checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
338dependencies = [ 338dependencies = [
339 "autocfg", 339 "cfg-if 1.0.0",
340 "cfg-if 0.1.10", 340 "const_fn",
341 "crossbeam-utils 0.7.2", 341 "crossbeam-utils 0.8.0",
342 "lazy_static", 342 "lazy_static",
343 "maybe-uninit",
344 "memoffset", 343 "memoffset",
345 "scopeguard", 344 "scopeguard",
346] 345]
@@ -498,6 +497,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
498checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" 497checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
499 498
500[[package]] 499[[package]]
500name = "generator"
501version = "0.6.23"
502source = "registry+https://github.com/rust-lang/crates.io-index"
503checksum = "8cdc09201b2e8ca1b19290cf7e65de2246b8e91fb6874279722189c4de7b94dc"
504dependencies = [
505 "cc",
506 "libc",
507 "log",
508 "rustc_version",
509 "winapi 0.3.9",
510]
511
512[[package]]
501name = "gimli" 513name = "gimli"
502version = "0.22.0" 514version = "0.22.0"
503source = "registry+https://github.com/rust-lang/crates.io-index" 515source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -796,11 +808,11 @@ checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743"
796 808
797[[package]] 809[[package]]
798name = "libloading" 810name = "libloading"
799version = "0.6.4" 811version = "0.6.5"
800source = "registry+https://github.com/rust-lang/crates.io-index" 812source = "registry+https://github.com/rust-lang/crates.io-index"
801checksum = "3557c9384f7f757f6d139cd3a4c62ef4e850696c16bf27924a5538c8a09717a1" 813checksum = "1090080fe06ec2648d0da3881d9453d97e71a45f00eb179af7fdd7e3f686fdb0"
802dependencies = [ 814dependencies = [
803 "cfg-if 0.1.10", 815 "cfg-if 1.0.0",
804 "winapi 0.3.9", 816 "winapi 0.3.9",
805] 817]
806 818
@@ -832,6 +844,19 @@ dependencies = [
832] 844]
833 845
834[[package]] 846[[package]]
847name = "loom"
848version = "0.3.6"
849source = "registry+https://github.com/rust-lang/crates.io-index"
850checksum = "a0e8460f2f2121162705187214720353c517b97bdfb3494c0b1e33d83ebe4bed"
851dependencies = [
852 "cfg-if 0.1.10",
853 "generator",
854 "scoped-tls",
855 "serde",
856 "serde_json",
857]
858
859[[package]]
835name = "lsp-server" 860name = "lsp-server"
836version = "0.4.1" 861version = "0.4.1"
837source = "registry+https://github.com/rust-lang/crates.io-index" 862source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1260,9 +1285,9 @@ dependencies = [
1260 1285
1261[[package]] 1286[[package]]
1262name = "rayon" 1287name = "rayon"
1263version = "1.4.1" 1288version = "1.5.0"
1264source = "registry+https://github.com/rust-lang/crates.io-index" 1289source = "registry+https://github.com/rust-lang/crates.io-index"
1265checksum = "dcf6960dc9a5b4ee8d3e4c5787b4a112a8818e0290a42ff664ad60692fdf2032" 1290checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
1266dependencies = [ 1291dependencies = [
1267 "autocfg", 1292 "autocfg",
1268 "crossbeam-deque", 1293 "crossbeam-deque",
@@ -1272,13 +1297,13 @@ dependencies = [
1272 1297
1273[[package]] 1298[[package]]
1274name = "rayon-core" 1299name = "rayon-core"
1275version = "1.8.1" 1300version = "1.9.0"
1276source = "registry+https://github.com/rust-lang/crates.io-index" 1301source = "registry+https://github.com/rust-lang/crates.io-index"
1277checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf" 1302checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
1278dependencies = [ 1303dependencies = [
1279 "crossbeam-channel 0.4.4", 1304 "crossbeam-channel 0.5.0",
1280 "crossbeam-deque", 1305 "crossbeam-deque",
1281 "crossbeam-utils 0.7.2", 1306 "crossbeam-utils 0.8.0",
1282 "lazy_static", 1307 "lazy_static",
1283 "num_cpus", 1308 "num_cpus",
1284] 1309]
@@ -1374,18 +1399,18 @@ dependencies = [
1374 1399
1375[[package]] 1400[[package]]
1376name = "rustc-ap-rustc_lexer" 1401name = "rustc-ap-rustc_lexer"
1377version = "683.0.0" 1402version = "685.0.0"
1378source = "registry+https://github.com/rust-lang/crates.io-index" 1403source = "registry+https://github.com/rust-lang/crates.io-index"
1379checksum = "c0c9a47e24d4b7d74ec583d8813803b36985ee082fe7debe55f257df92d5fe50" 1404checksum = "4d6465438127d20bf9d0f5148f806c029934a74c9bce1103a42d47e81d3fe89a"
1380dependencies = [ 1405dependencies = [
1381 "unicode-xid", 1406 "unicode-xid",
1382] 1407]
1383 1408
1384[[package]] 1409[[package]]
1385name = "rustc-demangle" 1410name = "rustc-demangle"
1386version = "0.1.17" 1411version = "0.1.18"
1387source = "registry+https://github.com/rust-lang/crates.io-index" 1412source = "registry+https://github.com/rust-lang/crates.io-index"
1388checksum = "b2610b7f643d18c87dff3b489950269617e6601a51f1f05aa5daefee36f64f0b" 1413checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
1389 1414
1390[[package]] 1415[[package]]
1391name = "rustc-hash" 1416name = "rustc-hash"
@@ -1394,6 +1419,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1394checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" 1419checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
1395 1420
1396[[package]] 1421[[package]]
1422name = "rustc_version"
1423version = "0.2.3"
1424source = "registry+https://github.com/rust-lang/crates.io-index"
1425checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
1426dependencies = [
1427 "semver 0.9.0",
1428]
1429
1430[[package]]
1397name = "ryu" 1431name = "ryu"
1398version = "1.0.5" 1432version = "1.0.5"
1399source = "registry+https://github.com/rust-lang/crates.io-index" 1433source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1460,9 +1494,9 @@ dependencies = [
1460 1494
1461[[package]] 1495[[package]]
1462name = "scroll_derive" 1496name = "scroll_derive"
1463version = "0.10.3" 1497version = "0.10.4"
1464source = "registry+https://github.com/rust-lang/crates.io-index" 1498source = "registry+https://github.com/rust-lang/crates.io-index"
1465checksum = "6dfde5d1531034db129e95c76ac857e2baecea3443579d493d02224950b0fb6d" 1499checksum = "b12bd20b94c7cdfda8c7ba9b92ad0d9a56e3fa018c25fca83b51aa664c9b4c0d"
1466dependencies = [ 1500dependencies = [
1467 "proc-macro2", 1501 "proc-macro2",
1468 "quote", 1502 "quote",
@@ -1471,16 +1505,31 @@ dependencies = [
1471 1505
1472[[package]] 1506[[package]]
1473name = "semver" 1507name = "semver"
1508version = "0.9.0"
1509source = "registry+https://github.com/rust-lang/crates.io-index"
1510checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
1511dependencies = [
1512 "semver-parser 0.7.0",
1513]
1514
1515[[package]]
1516name = "semver"
1474version = "0.11.0" 1517version = "0.11.0"
1475source = "registry+https://github.com/rust-lang/crates.io-index" 1518source = "registry+https://github.com/rust-lang/crates.io-index"
1476checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" 1519checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
1477dependencies = [ 1520dependencies = [
1478 "semver-parser", 1521 "semver-parser 0.10.1",
1479 "serde", 1522 "serde",
1480] 1523]
1481 1524
1482[[package]] 1525[[package]]
1483name = "semver-parser" 1526name = "semver-parser"
1527version = "0.7.0"
1528source = "registry+https://github.com/rust-lang/crates.io-index"
1529checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
1530
1531[[package]]
1532name = "semver-parser"
1484version = "0.10.1" 1533version = "0.10.1"
1485source = "registry+https://github.com/rust-lang/crates.io-index" 1534source = "registry+https://github.com/rust-lang/crates.io-index"
1486checksum = "42ef146c2ad5e5f4b037cd6ce2ebb775401729b19a82040c1beac9d36c7d1428" 1535checksum = "42ef146c2ad5e5f4b037cd6ce2ebb775401729b19a82040c1beac9d36c7d1428"
@@ -1532,11 +1581,12 @@ dependencies = [
1532 1581
1533[[package]] 1582[[package]]
1534name = "sharded-slab" 1583name = "sharded-slab"
1535version = "0.0.9" 1584version = "0.1.0"
1536source = "registry+https://github.com/rust-lang/crates.io-index" 1585source = "registry+https://github.com/rust-lang/crates.io-index"
1537checksum = "06d5a3f5166fb5b42a5439f2eee8b9de149e235961e3eb21c5808fc3ea17ff3e" 1586checksum = "7b4921be914e16899a80adefb821f8ddb7974e3f1250223575a44ed994882127"
1538dependencies = [ 1587dependencies = [
1539 "lazy_static", 1588 "lazy_static",
1589 "loom",
1540] 1590]
1541 1591
1542[[package]] 1592[[package]]
@@ -1581,9 +1631,9 @@ version = "0.0.0"
1581 1631
1582[[package]] 1632[[package]]
1583name = "syn" 1633name = "syn"
1584version = "1.0.45" 1634version = "1.0.46"
1585source = "registry+https://github.com/rust-lang/crates.io-index" 1635source = "registry+https://github.com/rust-lang/crates.io-index"
1586checksum = "ea9c5432ff16d6152371f808fb5a871cd67368171b09bb21b43df8e4a47a3556" 1636checksum = "5ad5de3220ea04da322618ded2c42233d02baca219d6f160a3e9c87cda16c942"
1587dependencies = [ 1637dependencies = [
1588 "proc-macro2", 1638 "proc-macro2",
1589 "quote", 1639 "quote",
@@ -1760,9 +1810,9 @@ dependencies = [
1760 1810
1761[[package]] 1811[[package]]
1762name = "tracing-subscriber" 1812name = "tracing-subscriber"
1763version = "0.2.13" 1813version = "0.2.14"
1764source = "registry+https://github.com/rust-lang/crates.io-index" 1814source = "registry+https://github.com/rust-lang/crates.io-index"
1765checksum = "4ef0a5e15477aa303afbfac3a44cba9b6430fdaad52423b1e6c0dbbe28c3eedd" 1815checksum = "2810660b9d5b18895d140caba6401765749a6a162e5d0736cfc44ea50db9d79d"
1766dependencies = [ 1816dependencies = [
1767 "ansi_term", 1817 "ansi_term",
1768 "chrono", 1818 "chrono",
diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml
index e9c62c6aa..be7c812cb 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 = "0.33" 20chalk-solve = "0.34"
21chalk-ir = "0.33" 21chalk-ir = "0.34"
22chalk-recursive = "0.33" 22chalk-recursive = "0.34"
23 23
24stdx = { path = "../stdx", version = "0.0.0" } 24stdx = { path = "../stdx", version = "0.0.0" }
25hir_def = { path = "../hir_def", version = "0.0.0" } 25hir_def = { path = "../hir_def", version = "0.0.0" }
diff --git a/crates/ide_db/Cargo.toml b/crates/ide_db/Cargo.toml
index 320fb15e5..62c5a29ae 100644
--- a/crates/ide_db/Cargo.toml
+++ b/crates/ide_db/Cargo.toml
@@ -14,7 +14,7 @@ wasm = []
14 14
15[dependencies] 15[dependencies]
16log = "0.4.8" 16log = "0.4.8"
17rayon = "1.3.0" 17rayon = "1.5.0"
18fst = { version = "0.4", default-features = false } 18fst = { version = "0.4", default-features = false }
19rustc-hash = "1.1.0" 19rustc-hash = "1.1.0"
20once_cell = "1.3.1" 20once_cell = "1.3.1"
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 66cf06e1a..752edc555 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -29,7 +29,7 @@ rustc-hash = "1.1.0"
29serde = { version = "1.0.106", features = ["derive"] } 29serde = { version = "1.0.106", features = ["derive"] }
30serde_json = "1.0.48" 30serde_json = "1.0.48"
31threadpool = "1.7.1" 31threadpool = "1.7.1"
32rayon = "1.3.1" 32rayon = "1.5"
33mimalloc = { version = "0.1.19", default-features = false, optional = true } 33mimalloc = { version = "0.1.19", default-features = false, optional = true }
34lsp-server = "0.4.0" 34lsp-server = "0.4.0"
35 35
diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml
index aa39ce554..e8de61868 100644
--- a/crates/syntax/Cargo.toml
+++ b/crates/syntax/Cargo.toml
@@ -13,7 +13,7 @@ doctest = false
13[dependencies] 13[dependencies]
14itertools = "0.9.0" 14itertools = "0.9.0"
15rowan = "0.10.0" 15rowan = "0.10.0"
16rustc_lexer = { version = "683.0.0", package = "rustc-ap-rustc_lexer" } 16rustc_lexer = { version = "685.0.0", package = "rustc-ap-rustc_lexer" }
17rustc-hash = "1.1.0" 17rustc-hash = "1.1.0"
18arrayvec = "0.5.1" 18arrayvec = "0.5.1"
19once_cell = "1.3.1" 19once_cell = "1.3.1"