aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-11-21 13:46:16 +0000
committerGitHub <[email protected]>2019-11-21 13:46:16 +0000
commit8c2eee4edefffbdea3f30383a87d09f062ae1fe8 (patch)
tree20dbe10b75eab2ec3a83c858f564b220095e1e51
parent0630bbabfc19126be5fa47933c5ea03d48030582 (diff)
parentaa20740944b7466a2f77781115ce948c3bf1866a (diff)
Merge #2339
2339: Update crates r=matklad a=kjeremy Removes duplicate crossbeam crates. Co-authored-by: Jeremy Kolb <[email protected]>
-rw-r--r--Cargo.lock41
1 files changed, 11 insertions, 30 deletions
diff --git a/Cargo.lock b/Cargo.lock
index ef3735197..8f7783deb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,7 +10,7 @@ dependencies = [
10 10
11[[package]] 11[[package]]
12name = "anyhow" 12name = "anyhow"
13version = "1.0.19" 13version = "1.0.22"
14source = "registry+https://github.com/rust-lang/crates.io-index" 14source = "registry+https://github.com/rust-lang/crates.io-index"
15 15
16[[package]] 16[[package]]
@@ -276,14 +276,6 @@ dependencies = [
276 276
277[[package]] 277[[package]]
278name = "crossbeam-queue" 278name = "crossbeam-queue"
279version = "0.1.2"
280source = "registry+https://github.com/rust-lang/crates.io-index"
281dependencies = [
282 "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
283]
284
285[[package]]
286name = "crossbeam-queue"
287version = "0.2.0" 279version = "0.2.0"
288source = "registry+https://github.com/rust-lang/crates.io-index" 280source = "registry+https://github.com/rust-lang/crates.io-index"
289dependencies = [ 281dependencies = [
@@ -292,15 +284,6 @@ dependencies = [
292 284
293[[package]] 285[[package]]
294name = "crossbeam-utils" 286name = "crossbeam-utils"
295version = "0.6.6"
296source = "registry+https://github.com/rust-lang/crates.io-index"
297dependencies = [
298 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
299 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
300]
301
302[[package]]
303name = "crossbeam-utils"
304version = "0.7.0" 287version = "0.7.0"
305source = "registry+https://github.com/rust-lang/crates.io-index" 288source = "registry+https://github.com/rust-lang/crates.io-index"
306dependencies = [ 289dependencies = [
@@ -1092,7 +1075,7 @@ dependencies = [
1092 "ra_syntax 0.1.0", 1075 "ra_syntax 0.1.0",
1093 "ra_text_edit 0.1.0", 1076 "ra_text_edit 0.1.0",
1094 "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", 1077 "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
1095 "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 1078 "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
1096 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1079 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1097 "superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", 1080 "superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1098 "test_utils 0.1.0", 1081 "test_utils 0.1.0",
@@ -1371,22 +1354,22 @@ dependencies = [
1371 1354
1372[[package]] 1355[[package]]
1373name = "rayon" 1356name = "rayon"
1374version = "1.2.0" 1357version = "1.2.1"
1375source = "registry+https://github.com/rust-lang/crates.io-index" 1358source = "registry+https://github.com/rust-lang/crates.io-index"
1376dependencies = [ 1359dependencies = [
1377 "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", 1360 "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
1378 "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", 1361 "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
1379 "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", 1362 "rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
1380] 1363]
1381 1364
1382[[package]] 1365[[package]]
1383name = "rayon-core" 1366name = "rayon-core"
1384version = "1.6.0" 1367version = "1.6.1"
1385source = "registry+https://github.com/rust-lang/crates.io-index" 1368source = "registry+https://github.com/rust-lang/crates.io-index"
1386dependencies = [ 1369dependencies = [
1387 "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", 1370 "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
1388 "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", 1371 "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
1389 "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", 1372 "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
1390 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1373 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
1391 "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", 1374 "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
1392] 1375]
@@ -1833,7 +1816,7 @@ dependencies = [
1833name = "xtask" 1816name = "xtask"
1834version = "0.1.0" 1817version = "0.1.0"
1835dependencies = [ 1818dependencies = [
1836 "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", 1819 "anyhow 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
1837 "pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", 1820 "pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
1838 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", 1821 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
1839 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", 1822 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1857,7 +1840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1857 1840
1858[metadata] 1841[metadata]
1859"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" 1842"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
1860"checksum anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "57114fc2a6cc374bce195d3482057c846e706d252ff3604363449695684d7a0d" 1843"checksum anyhow 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "e19f23ab207147bbdbcdfa7f7e4ca5e84963d79bae3937074682177ab9150968"
1861"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" 1844"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
1862"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" 1845"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
1863"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" 1846"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
@@ -1887,9 +1870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1887"checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c" 1870"checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
1888"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" 1871"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
1889"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" 1872"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
1890"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
1891"checksum crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfd6515864a82d2f877b42813d4553292c6659498c9a2aa31bab5a15243c2700" 1873"checksum crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfd6515864a82d2f877b42813d4553292c6659498c9a2aa31bab5a15243c2700"
1892"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
1893"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" 1874"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
1894"checksum derive-new 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "71f31892cd5c62e414316f2963c5689242c43d8e7bbcaaeca97e5e28c95d91d9" 1875"checksum derive-new 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "71f31892cd5c62e414316f2963c5689242c43d8e7bbcaaeca97e5e28c95d91d9"
1895"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" 1876"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
@@ -1984,8 +1965,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1984"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" 1965"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
1985"checksum rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" 1966"checksum rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
1986"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" 1967"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
1987"checksum rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123" 1968"checksum rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "43739f8831493b276363637423d3622d4bd6394ab6f0a9c4a552e208aeb7fddd"
1988"checksum rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b" 1969"checksum rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8bf17de6f23b05473c437eb958b9c850bfc8af0961fe17b4cc92d5a627b4791"
1989"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" 1970"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
1990"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" 1971"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
1991"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" 1972"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"