Skip to content

Commit ba1a488

Browse files
authored
Rollup merge of rust-lang#67031 - mati865:tokio-update, r=nikomatsakis
Update tokio crates to latest versions Drops few old crates from the workspace (they are only used during tests, not in Rust itself) and allows to remove even more crates during next `rustc-ap-*` update.
2 parents ef01330 + 2d8d813 commit ba1a488

File tree

1 file changed

+55
-97
lines changed

1 file changed

+55
-97
lines changed

Cargo.lock

+55-97
Original file line numberDiff line numberDiff line change
@@ -724,16 +724,6 @@ dependencies = [
724724
"smallvec 0.6.10",
725725
]
726726

727-
[[package]]
728-
name = "crossbeam-deque"
729-
version = "0.6.3"
730-
source = "registry+https://github.com/rust-lang/crates.io-index"
731-
checksum = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
732-
dependencies = [
733-
"crossbeam-epoch",
734-
"crossbeam-utils 0.6.5",
735-
]
736-
737727
[[package]]
738728
name = "crossbeam-deque"
739729
version = "0.7.1"
@@ -755,7 +745,7 @@ dependencies = [
755745
"crossbeam-utils 0.6.5",
756746
"lazy_static 1.3.0",
757747
"memoffset",
758-
"scopeguard 1.0.0",
748+
"scopeguard",
759749
]
760750

761751
[[package]]
@@ -1407,7 +1397,7 @@ version = "0.5.1"
14071397
source = "registry+https://github.com/rust-lang/crates.io-index"
14081398
checksum = "a3753954f7bd71f0e671afb8b5a992d1724cf43b7f95a563cd4a0bde94659ca8"
14091399
dependencies = [
1410-
"scopeguard 1.0.0",
1400+
"scopeguard",
14111401
"winapi 0.3.8",
14121402
]
14131403

@@ -1726,7 +1716,7 @@ dependencies = [
17261716
"jsonrpc-server-utils",
17271717
"log",
17281718
"parity-tokio-ipc",
1729-
"parking_lot 0.9.0",
1719+
"parking_lot",
17301720
"tokio-service",
17311721
]
17321722

@@ -1738,7 +1728,7 @@ checksum = "e2c08b444cc0ed70263798834343d0ac875e664257df8079160f23ac1ea79446"
17381728
dependencies = [
17391729
"jsonrpc-core",
17401730
"log",
1741-
"parking_lot 0.9.0",
1731+
"parking_lot",
17421732
"serde",
17431733
]
17441734

@@ -1850,23 +1840,13 @@ dependencies = [
18501840
name = "linkchecker"
18511841
version = "0.1.0"
18521842

1853-
[[package]]
1854-
name = "lock_api"
1855-
version = "0.1.3"
1856-
source = "registry+https://github.com/rust-lang/crates.io-index"
1857-
checksum = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"
1858-
dependencies = [
1859-
"owning_ref",
1860-
"scopeguard 0.3.3",
1861-
]
1862-
18631843
[[package]]
18641844
name = "lock_api"
18651845
version = "0.3.1"
18661846
source = "registry+https://github.com/rust-lang/crates.io-index"
18671847
checksum = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
18681848
dependencies = [
1869-
"scopeguard 1.0.0",
1849+
"scopeguard",
18701850
]
18711851

18721852
[[package]]
@@ -2027,7 +2007,7 @@ checksum = "c420bbc064623934620b5ab2dc0cf96451b34163329e82f95e7fa1b7b99a6ac8"
20272007
dependencies = [
20282008
"byteorder",
20292009
"memmap",
2030-
"parking_lot 0.9.0",
2010+
"parking_lot",
20312011
"rustc-hash",
20322012
]
20332013

@@ -2320,15 +2300,6 @@ version = "0.3.0"
23202300
source = "registry+https://github.com/rust-lang/crates.io-index"
23212301
checksum = "dd20eec3dbe4376829cb7d80ae6ac45e0a766831dca50202ff2d40db46a8a024"
23222302

2323-
[[package]]
2324-
name = "owning_ref"
2325-
version = "0.3.3"
2326-
source = "registry+https://github.com/rust-lang/crates.io-index"
2327-
checksum = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
2328-
dependencies = [
2329-
"stable_deref_trait",
2330-
]
2331-
23322303
[[package]]
23332304
name = "packed_simd"
23342305
version = "0.3.1"
@@ -2377,38 +2348,15 @@ dependencies = [
23772348
"winapi 0.3.8",
23782349
]
23792350

2380-
[[package]]
2381-
name = "parking_lot"
2382-
version = "0.7.1"
2383-
source = "registry+https://github.com/rust-lang/crates.io-index"
2384-
checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
2385-
dependencies = [
2386-
"lock_api 0.1.3",
2387-
"parking_lot_core 0.4.0",
2388-
]
2389-
23902351
[[package]]
23912352
name = "parking_lot"
23922353
version = "0.9.0"
23932354
source = "registry+https://github.com/rust-lang/crates.io-index"
23942355
checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
23952356
dependencies = [
2396-
"lock_api 0.3.1",
2397-
"parking_lot_core 0.6.2",
2398-
"rustc_version",
2399-
]
2400-
2401-
[[package]]
2402-
name = "parking_lot_core"
2403-
version = "0.4.0"
2404-
source = "registry+https://github.com/rust-lang/crates.io-index"
2405-
checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
2406-
dependencies = [
2407-
"libc",
2408-
"rand 0.6.1",
2357+
"lock_api",
2358+
"parking_lot_core",
24092359
"rustc_version",
2410-
"smallvec 0.6.10",
2411-
"winapi 0.3.8",
24122360
]
24132361

24142362
[[package]]
@@ -2879,7 +2827,7 @@ version = "1.2.0"
28792827
source = "registry+https://github.com/rust-lang/crates.io-index"
28802828
checksum = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123"
28812829
dependencies = [
2882-
"crossbeam-deque 0.7.1",
2830+
"crossbeam-deque",
28832831
"either",
28842832
"rayon-core",
28852833
]
@@ -2890,7 +2838,7 @@ version = "1.6.0"
28902838
source = "registry+https://github.com/rust-lang/crates.io-index"
28912839
checksum = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b"
28922840
dependencies = [
2893-
"crossbeam-deque 0.7.1",
2841+
"crossbeam-deque",
28942842
"crossbeam-queue",
28952843
"crossbeam-utils 0.6.5",
28962844
"lazy_static 1.3.0",
@@ -3155,7 +3103,7 @@ dependencies = [
31553103
"log",
31563104
"measureme",
31573105
"num_cpus",
3158-
"parking_lot 0.9.0",
3106+
"parking_lot",
31593107
"polonius-engine",
31603108
"rustc-rayon",
31613109
"rustc-rayon-core",
@@ -3205,7 +3153,7 @@ dependencies = [
32053153
"jobserver",
32063154
"lazy_static 1.3.0",
32073155
"log",
3208-
"parking_lot 0.9.0",
3156+
"parking_lot",
32093157
"rustc-ap-graphviz",
32103158
"rustc-ap-rustc_index",
32113159
"rustc-ap-serialize",
@@ -3360,7 +3308,7 @@ version = "0.3.0"
33603308
source = "registry+https://github.com/rust-lang/crates.io-index"
33613309
checksum = "f32767f90d938f1b7199a174ef249ae1924f6e5bbdb9d112fea141e016f25b3a"
33623310
dependencies = [
3363-
"crossbeam-deque 0.7.1",
3311+
"crossbeam-deque",
33643312
"either",
33653313
"rustc-rayon-core",
33663314
]
@@ -3371,7 +3319,7 @@ version = "0.3.0"
33713319
source = "registry+https://github.com/rust-lang/crates.io-index"
33723320
checksum = "ea2427831f0053ea3ea73559c8eabd893133a51b251d142bacee53c62a288cb3"
33733321
dependencies = [
3374-
"crossbeam-deque 0.7.1",
3322+
"crossbeam-deque",
33753323
"crossbeam-queue",
33763324
"crossbeam-utils 0.6.5",
33773325
"lazy_static 1.3.0",
@@ -3515,7 +3463,7 @@ dependencies = [
35153463
"lazy_static 1.3.0",
35163464
"log",
35173465
"measureme",
3518-
"parking_lot 0.9.0",
3466+
"parking_lot",
35193467
"rustc-hash",
35203468
"rustc-rayon",
35213469
"rustc-rayon-core",
@@ -4054,12 +4002,6 @@ version = "0.1.9"
40544002
source = "registry+https://github.com/rust-lang/crates.io-index"
40554003
checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
40564004

4057-
[[package]]
4058-
name = "scopeguard"
4059-
version = "0.3.3"
4060-
source = "registry+https://github.com/rust-lang/crates.io-index"
4061-
checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
4062-
40634005
[[package]]
40644006
name = "scopeguard"
40654007
version = "1.0.0"
@@ -4655,9 +4597,9 @@ dependencies = [
46554597

46564598
[[package]]
46574599
name = "tokio"
4658-
version = "0.1.14"
4600+
version = "0.1.22"
46594601
source = "registry+https://github.com/rust-lang/crates.io-index"
4660-
checksum = "4790d0be6f4ba6ae4f48190efa2ed7780c9e3567796abdb285003cf39840d9c5"
4602+
checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
46614603
dependencies = [
46624604
"bytes",
46634605
"futures",
@@ -4669,6 +4611,7 @@ dependencies = [
46694611
"tokio-fs",
46704612
"tokio-io",
46714613
"tokio-reactor",
4614+
"tokio-sync",
46724615
"tokio-tcp",
46734616
"tokio-threadpool",
46744617
"tokio-timer",
@@ -4700,29 +4643,29 @@ dependencies = [
47004643

47014644
[[package]]
47024645
name = "tokio-current-thread"
4703-
version = "0.1.4"
4646+
version = "0.1.6"
47044647
source = "registry+https://github.com/rust-lang/crates.io-index"
4705-
checksum = "331c8acc267855ec06eb0c94618dcbbfea45bed2d20b77252940095273fb58f6"
4648+
checksum = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443"
47064649
dependencies = [
47074650
"futures",
47084651
"tokio-executor",
47094652
]
47104653

47114654
[[package]]
47124655
name = "tokio-executor"
4713-
version = "0.1.6"
4656+
version = "0.1.9"
47144657
source = "registry+https://github.com/rust-lang/crates.io-index"
4715-
checksum = "30c6dbf2d1ad1de300b393910e8a3aa272b724a400b6531da03eed99e329fbf0"
4658+
checksum = "ca6df436c42b0c3330a82d855d2ef017cd793090ad550a6bc2184f4b933532ab"
47164659
dependencies = [
47174660
"crossbeam-utils 0.6.5",
47184661
"futures",
47194662
]
47204663

47214664
[[package]]
47224665
name = "tokio-fs"
4723-
version = "0.1.5"
4666+
version = "0.1.6"
47244667
source = "registry+https://github.com/rust-lang/crates.io-index"
4725-
checksum = "0e9cbbc8a3698b7ab652340f46633364f9eaa928ddaaee79d8b8f356dd79a09d"
4668+
checksum = "3fe6dc22b08d6993916647d108a1a7d15b9cd29c4f4496c62b92c45b5041b7af"
47264669
dependencies = [
47274670
"futures",
47284671
"tokio-io",
@@ -4731,9 +4674,9 @@ dependencies = [
47314674

47324675
[[package]]
47334676
name = "tokio-io"
4734-
version = "0.1.11"
4677+
version = "0.1.12"
47354678
source = "registry+https://github.com/rust-lang/crates.io-index"
4736-
checksum = "b53aeb9d3f5ccf2ebb29e19788f96987fa1355f8fe45ea193928eaaaf3ae820f"
4679+
checksum = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926"
47374680
dependencies = [
47384681
"bytes",
47394682
"futures",
@@ -4755,12 +4698,15 @@ dependencies = [
47554698

47564699
[[package]]
47574700
name = "tokio-process"
4758-
version = "0.2.3"
4701+
version = "0.2.4"
47594702
source = "registry+https://github.com/rust-lang/crates.io-index"
4760-
checksum = "88e1281e412013f1ff5787def044a9577a0bed059f451e835f1643201f8b777d"
4703+
checksum = "afbd6ef1b8cc2bd2c2b580d882774d443ebb1c6ceefe35ba9ea4ab586c89dbe8"
47614704
dependencies = [
4705+
"crossbeam-queue",
47624706
"futures",
4707+
"lazy_static 1.3.0",
47634708
"libc",
4709+
"log",
47644710
"mio",
47654711
"mio-named-pipes",
47664712
"tokio-io",
@@ -4771,20 +4717,21 @@ dependencies = [
47714717

47724718
[[package]]
47734719
name = "tokio-reactor"
4774-
version = "0.1.8"
4720+
version = "0.1.11"
47754721
source = "registry+https://github.com/rust-lang/crates.io-index"
4776-
checksum = "afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f"
4722+
checksum = "6732fe6b53c8d11178dcb77ac6d9682af27fc6d4cb87789449152e5377377146"
47774723
dependencies = [
47784724
"crossbeam-utils 0.6.5",
47794725
"futures",
47804726
"lazy_static 1.3.0",
47814727
"log",
47824728
"mio",
47834729
"num_cpus",
4784-
"parking_lot 0.7.1",
4730+
"parking_lot",
47854731
"slab",
47864732
"tokio-executor",
47874733
"tokio-io",
4734+
"tokio-sync",
47884735
]
47894736

47904737
[[package]]
@@ -4813,6 +4760,16 @@ dependencies = [
48134760
"winapi 0.3.8",
48144761
]
48154762

4763+
[[package]]
4764+
name = "tokio-sync"
4765+
version = "0.1.7"
4766+
source = "registry+https://github.com/rust-lang/crates.io-index"
4767+
checksum = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76"
4768+
dependencies = [
4769+
"fnv",
4770+
"futures",
4771+
]
4772+
48164773
[[package]]
48174774
name = "tokio-tcp"
48184775
version = "0.1.3"
@@ -4829,25 +4786,26 @@ dependencies = [
48294786

48304787
[[package]]
48314788
name = "tokio-threadpool"
4832-
version = "0.1.10"
4789+
version = "0.1.17"
48334790
source = "registry+https://github.com/rust-lang/crates.io-index"
4834-
checksum = "17465013014410310f9f61fa10bf4724803c149ea1d51efece131c38efca93aa"
4791+
checksum = "f0c32ffea4827978e9aa392d2f743d973c1dfa3730a2ed3f22ce1e6984da848c"
48354792
dependencies = [
4836-
"crossbeam-channel",
4837-
"crossbeam-deque 0.6.3",
4793+
"crossbeam-deque",
4794+
"crossbeam-queue",
48384795
"crossbeam-utils 0.6.5",
48394796
"futures",
4797+
"lazy_static 1.3.0",
48404798
"log",
48414799
"num_cpus",
4842-
"rand 0.6.1",
4800+
"slab",
48434801
"tokio-executor",
48444802
]
48454803

48464804
[[package]]
48474805
name = "tokio-timer"
4848-
version = "0.2.8"
4806+
version = "0.2.12"
48494807
source = "registry+https://github.com/rust-lang/crates.io-index"
4850-
checksum = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
4808+
checksum = "1739638e364e558128461fc1ad84d997702c8e31c2e6b18fb99842268199e827"
48514809
dependencies = [
48524810
"crossbeam-utils 0.6.5",
48534811
"futures",
@@ -4857,9 +4815,9 @@ dependencies = [
48574815

48584816
[[package]]
48594817
name = "tokio-udp"
4860-
version = "0.1.3"
4818+
version = "0.1.5"
48614819
source = "registry+https://github.com/rust-lang/crates.io-index"
4862-
checksum = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
4820+
checksum = "f02298505547f73e60f568359ef0d016d5acd6e830ab9bc7c4a5b3403440121b"
48634821
dependencies = [
48644822
"bytes",
48654823
"futures",

0 commit comments

Comments
 (0)