aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-02-22 21:23:06 +0000
committerGitHub <[email protected]>2020-02-22 21:23:06 +0000
commit650586a83869d6769c3d0fb94ffd2ccfcbd97db5 (patch)
tree9aa2a458f99d757ee668242d76582fcb5ea70a51
parente91375c763a74ebf3784f2d1df542095eb8a159d (diff)
parent9077942212bb0315740fbdf82aa10431e3062a0e (diff)
Merge #3276
3276: Bump crossbeam crates r=kjeremy a=lnicola This removes a duplicate `autocfg` dependency and was supposed to upgrade `rand`, but it got reverted in `crossbeam` to keep it compiling on pre-2018 edition compilers. Co-authored-by: Laurențiu Nicola <[email protected]>
Diffstat
-rw-r--r--Cargo.lock49
1 files changed, 26 insertions, 23 deletions
diff --git a/Cargo.lock b/Cargo.lock
index a808f4743..0b4d5ebe6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -40,12 +40,6 @@ dependencies = [
40 40
41[[package]] 41[[package]]
42name = "autocfg" 42name = "autocfg"
43version = "0.1.7"
44source = "registry+https://github.com/rust-lang/crates.io-index"
45checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
46
47[[package]]
48name = "autocfg"
49version = "1.0.0" 43version = "1.0.0"
50source = "registry+https://github.com/rust-lang/crates.io-index" 44source = "registry+https://github.com/rust-lang/crates.io-index"
51checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" 45checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
@@ -249,33 +243,36 @@ dependencies = [
249 243
250[[package]] 244[[package]]
251name = "crossbeam-channel" 245name = "crossbeam-channel"
252version = "0.4.0" 246version = "0.4.2"
253source = "registry+https://github.com/rust-lang/crates.io-index" 247source = "registry+https://github.com/rust-lang/crates.io-index"
254checksum = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c" 248checksum = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061"
255dependencies = [ 249dependencies = [
256 "crossbeam-utils", 250 "crossbeam-utils",
251 "maybe-uninit",
257] 252]
258 253
259[[package]] 254[[package]]
260name = "crossbeam-deque" 255name = "crossbeam-deque"
261version = "0.7.2" 256version = "0.7.3"
262source = "registry+https://github.com/rust-lang/crates.io-index" 257source = "registry+https://github.com/rust-lang/crates.io-index"
263checksum = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" 258checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
264dependencies = [ 259dependencies = [
265 "crossbeam-epoch", 260 "crossbeam-epoch",
266 "crossbeam-utils", 261 "crossbeam-utils",
262 "maybe-uninit",
267] 263]
268 264
269[[package]] 265[[package]]
270name = "crossbeam-epoch" 266name = "crossbeam-epoch"
271version = "0.8.0" 267version = "0.8.2"
272source = "registry+https://github.com/rust-lang/crates.io-index" 268source = "registry+https://github.com/rust-lang/crates.io-index"
273checksum = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" 269checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
274dependencies = [ 270dependencies = [
275 "autocfg 0.1.7", 271 "autocfg",
276 "cfg-if", 272 "cfg-if",
277 "crossbeam-utils", 273 "crossbeam-utils",
278 "lazy_static", 274 "lazy_static",
275 "maybe-uninit",
279 "memoffset", 276 "memoffset",
280 "scopeguard", 277 "scopeguard",
281] 278]
@@ -292,11 +289,11 @@ dependencies = [
292 289
293[[package]] 290[[package]]
294name = "crossbeam-utils" 291name = "crossbeam-utils"
295version = "0.7.0" 292version = "0.7.2"
296source = "registry+https://github.com/rust-lang/crates.io-index" 293source = "registry+https://github.com/rust-lang/crates.io-index"
297checksum = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" 294checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
298dependencies = [ 295dependencies = [
299 "autocfg 0.1.7", 296 "autocfg",
300 "cfg-if", 297 "cfg-if",
301 "lazy_static", 298 "lazy_static",
302] 299]
@@ -488,7 +485,7 @@ version = "1.3.2"
488source = "registry+https://github.com/rust-lang/crates.io-index" 485source = "registry+https://github.com/rust-lang/crates.io-index"
489checksum = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292" 486checksum = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292"
490dependencies = [ 487dependencies = [
491 "autocfg 1.0.0", 488 "autocfg",
492] 489]
493 490
494[[package]] 491[[package]]
@@ -623,9 +620,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
623 620
624[[package]] 621[[package]]
625name = "libc" 622name = "libc"
626version = "0.2.66" 623version = "0.2.67"
627source = "registry+https://github.com/rust-lang/crates.io-index" 624source = "registry+https://github.com/rust-lang/crates.io-index"
628checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" 625checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
629 626
630[[package]] 627[[package]]
631name = "linked-hash-map" 628name = "linked-hash-map"
@@ -684,10 +681,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
684checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" 681checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
685 682
686[[package]] 683[[package]]
684name = "maybe-uninit"
685version = "2.0.0"
686source = "registry+https://github.com/rust-lang/crates.io-index"
687checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
688
689[[package]]
687name = "memchr" 690name = "memchr"
688version = "2.3.2" 691version = "2.3.3"
689source = "registry+https://github.com/rust-lang/crates.io-index" 692source = "registry+https://github.com/rust-lang/crates.io-index"
690checksum = "53445de381a1f436797497c61d851644d0e8e88e6140f22872ad33a704933978" 693checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
691 694
692[[package]] 695[[package]]
693name = "memoffset" 696name = "memoffset"
@@ -1531,9 +1534,9 @@ checksum = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f"
1531 1534
1532[[package]] 1535[[package]]
1533name = "syn" 1536name = "syn"
1534version = "1.0.14" 1537version = "1.0.15"
1535source = "registry+https://github.com/rust-lang/crates.io-index" 1538source = "registry+https://github.com/rust-lang/crates.io-index"
1536checksum = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" 1539checksum = "7a0294dc449adc58bb6592fff1a23d3e5e6e235afc6a0ffca2657d19e7bbffe5"
1537dependencies = [ 1540dependencies = [
1538 "proc-macro2", 1541 "proc-macro2",
1539 "quote", 1542 "quote",
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 13:24:56 +0000