Skip to content

Commit 3824e76

Browse files
authored
Rollup merge of #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 99a1ae8 + d358b24 commit 3824e76

File tree

1 file changed

+47
-83
lines changed

1 file changed

+47
-83
lines changed

Cargo.lock

+47-83
Original file line numberDiff line numberDiff line change
@@ -734,16 +734,6 @@ dependencies = [
734734
"crossbeam-utils 0.2.2",
735735
]
736736

737-
[[package]]
738-
name = "crossbeam-deque"
739-
version = "0.6.3"
740-
source = "registry+https://github.com/rust-lang/crates.io-index"
741-
checksum = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
742-
dependencies = [
743-
"crossbeam-epoch 0.7.2",
744-
"crossbeam-utils 0.6.5",
745-
]
746-
747737
[[package]]
748738
name = "crossbeam-deque"
749739
version = "0.7.1"
@@ -1760,7 +1750,7 @@ dependencies = [
17601750
"jsonrpc-server-utils",
17611751
"log",
17621752
"parity-tokio-ipc",
1763-
"parking_lot 0.9.0",
1753+
"parking_lot",
17641754
"tokio-service",
17651755
]
17661756

@@ -1772,7 +1762,7 @@ checksum = "e2c08b444cc0ed70263798834343d0ac875e664257df8079160f23ac1ea79446"
17721762
dependencies = [
17731763
"jsonrpc-core",
17741764
"log",
1775-
"parking_lot 0.9.0",
1765+
"parking_lot",
17761766
"serde",
17771767
]
17781768

@@ -1884,16 +1874,6 @@ dependencies = [
18841874
name = "linkchecker"
18851875
version = "0.1.0"
18861876

1887-
[[package]]
1888-
name = "lock_api"
1889-
version = "0.1.3"
1890-
source = "registry+https://github.com/rust-lang/crates.io-index"
1891-
checksum = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"
1892-
dependencies = [
1893-
"owning_ref",
1894-
"scopeguard 0.3.3",
1895-
]
1896-
18971877
[[package]]
18981878
name = "lock_api"
18991879
version = "0.3.1"
@@ -2358,15 +2338,6 @@ version = "0.3.0"
23582338
source = "registry+https://github.com/rust-lang/crates.io-index"
23592339
checksum = "dd20eec3dbe4376829cb7d80ae6ac45e0a766831dca50202ff2d40db46a8a024"
23602340

2361-
[[package]]
2362-
name = "owning_ref"
2363-
version = "0.3.3"
2364-
source = "registry+https://github.com/rust-lang/crates.io-index"
2365-
checksum = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
2366-
dependencies = [
2367-
"stable_deref_trait",
2368-
]
2369-
23702341
[[package]]
23712342
name = "packed_simd"
23722343
version = "0.3.1"
@@ -2415,40 +2386,17 @@ dependencies = [
24152386
"winapi 0.3.8",
24162387
]
24172388

2418-
[[package]]
2419-
name = "parking_lot"
2420-
version = "0.7.1"
2421-
source = "registry+https://github.com/rust-lang/crates.io-index"
2422-
checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
2423-
dependencies = [
2424-
"lock_api 0.1.3",
2425-
"parking_lot_core 0.4.0",
2426-
]
2427-
24282389
[[package]]
24292390
name = "parking_lot"
24302391
version = "0.9.0"
24312392
source = "registry+https://github.com/rust-lang/crates.io-index"
24322393
checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
24332394
dependencies = [
2434-
"lock_api 0.3.1",
2435-
"parking_lot_core 0.6.2",
2395+
"lock_api",
2396+
"parking_lot_core",
24362397
"rustc_version",
24372398
]
24382399

2439-
[[package]]
2440-
name = "parking_lot_core"
2441-
version = "0.4.0"
2442-
source = "registry+https://github.com/rust-lang/crates.io-index"
2443-
checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
2444-
dependencies = [
2445-
"libc",
2446-
"rand 0.6.1",
2447-
"rustc_version",
2448-
"smallvec 0.6.10",
2449-
"winapi 0.3.8",
2450-
]
2451-
24522400
[[package]]
24532401
name = "parking_lot_core"
24542402
version = "0.6.2"
@@ -3193,7 +3141,7 @@ dependencies = [
31933141
"log",
31943142
"measureme",
31953143
"num_cpus",
3196-
"parking_lot 0.9.0",
3144+
"parking_lot",
31973145
"polonius-engine",
31983146
"rustc-rayon 0.3.0",
31993147
"rustc-rayon-core 0.3.0",
@@ -3243,7 +3191,7 @@ dependencies = [
32433191
"jobserver",
32443192
"lazy_static 1.3.0",
32453193
"log",
3246-
"parking_lot 0.9.0",
3194+
"parking_lot",
32473195
"rustc-ap-graphviz",
32483196
"rustc-ap-rustc_index",
32493197
"rustc-ap-serialize",
@@ -3556,7 +3504,7 @@ dependencies = [
35563504
"lazy_static 1.3.0",
35573505
"log",
35583506
"measureme",
3559-
"parking_lot 0.9.0",
3507+
"parking_lot",
35603508
"rustc-hash",
35613509
"rustc-rayon 0.3.0",
35623510
"rustc-rayon-core 0.3.0",
@@ -4692,9 +4640,9 @@ dependencies = [
46924640

46934641
[[package]]
46944642
name = "tokio"
4695-
version = "0.1.14"
4643+
version = "0.1.22"
46964644
source = "registry+https://github.com/rust-lang/crates.io-index"
4697-
checksum = "4790d0be6f4ba6ae4f48190efa2ed7780c9e3567796abdb285003cf39840d9c5"
4645+
checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
46984646
dependencies = [
46994647
"bytes",
47004648
"futures",
@@ -4706,6 +4654,7 @@ dependencies = [
47064654
"tokio-fs",
47074655
"tokio-io",
47084656
"tokio-reactor",
4657+
"tokio-sync",
47094658
"tokio-tcp",
47104659
"tokio-threadpool",
47114660
"tokio-timer",
@@ -4737,29 +4686,29 @@ dependencies = [
47374686

47384687
[[package]]
47394688
name = "tokio-current-thread"
4740-
version = "0.1.4"
4689+
version = "0.1.6"
47414690
source = "registry+https://github.com/rust-lang/crates.io-index"
4742-
checksum = "331c8acc267855ec06eb0c94618dcbbfea45bed2d20b77252940095273fb58f6"
4691+
checksum = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443"
47434692
dependencies = [
47444693
"futures",
47454694
"tokio-executor",
47464695
]
47474696

47484697
[[package]]
47494698
name = "tokio-executor"
4750-
version = "0.1.6"
4699+
version = "0.1.9"
47514700
source = "registry+https://github.com/rust-lang/crates.io-index"
4752-
checksum = "30c6dbf2d1ad1de300b393910e8a3aa272b724a400b6531da03eed99e329fbf0"
4701+
checksum = "ca6df436c42b0c3330a82d855d2ef017cd793090ad550a6bc2184f4b933532ab"
47534702
dependencies = [
47544703
"crossbeam-utils 0.6.5",
47554704
"futures",
47564705
]
47574706

47584707
[[package]]
47594708
name = "tokio-fs"
4760-
version = "0.1.5"
4709+
version = "0.1.6"
47614710
source = "registry+https://github.com/rust-lang/crates.io-index"
4762-
checksum = "0e9cbbc8a3698b7ab652340f46633364f9eaa928ddaaee79d8b8f356dd79a09d"
4711+
checksum = "3fe6dc22b08d6993916647d108a1a7d15b9cd29c4f4496c62b92c45b5041b7af"
47634712
dependencies = [
47644713
"futures",
47654714
"tokio-io",
@@ -4768,9 +4717,9 @@ dependencies = [
47684717

47694718
[[package]]
47704719
name = "tokio-io"
4771-
version = "0.1.11"
4720+
version = "0.1.12"
47724721
source = "registry+https://github.com/rust-lang/crates.io-index"
4773-
checksum = "b53aeb9d3f5ccf2ebb29e19788f96987fa1355f8fe45ea193928eaaaf3ae820f"
4722+
checksum = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926"
47744723
dependencies = [
47754724
"bytes",
47764725
"futures",
@@ -4792,12 +4741,15 @@ dependencies = [
47924741

47934742
[[package]]
47944743
name = "tokio-process"
4795-
version = "0.2.3"
4744+
version = "0.2.4"
47964745
source = "registry+https://github.com/rust-lang/crates.io-index"
4797-
checksum = "88e1281e412013f1ff5787def044a9577a0bed059f451e835f1643201f8b777d"
4746+
checksum = "afbd6ef1b8cc2bd2c2b580d882774d443ebb1c6ceefe35ba9ea4ab586c89dbe8"
47984747
dependencies = [
4748+
"crossbeam-queue",
47994749
"futures",
4750+
"lazy_static 1.3.0",
48004751
"libc",
4752+
"log",
48014753
"mio",
48024754
"mio-named-pipes",
48034755
"tokio-io",
@@ -4808,20 +4760,21 @@ dependencies = [
48084760

48094761
[[package]]
48104762
name = "tokio-reactor"
4811-
version = "0.1.8"
4763+
version = "0.1.11"
48124764
source = "registry+https://github.com/rust-lang/crates.io-index"
4813-
checksum = "afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f"
4765+
checksum = "6732fe6b53c8d11178dcb77ac6d9682af27fc6d4cb87789449152e5377377146"
48144766
dependencies = [
48154767
"crossbeam-utils 0.6.5",
48164768
"futures",
48174769
"lazy_static 1.3.0",
48184770
"log",
48194771
"mio",
48204772
"num_cpus",
4821-
"parking_lot 0.7.1",
4773+
"parking_lot",
48224774
"slab",
48234775
"tokio-executor",
48244776
"tokio-io",
4777+
"tokio-sync",
48254778
]
48264779

48274780
[[package]]
@@ -4850,6 +4803,16 @@ dependencies = [
48504803
"winapi 0.3.8",
48514804
]
48524805

4806+
[[package]]
4807+
name = "tokio-sync"
4808+
version = "0.1.7"
4809+
source = "registry+https://github.com/rust-lang/crates.io-index"
4810+
checksum = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76"
4811+
dependencies = [
4812+
"fnv",
4813+
"futures",
4814+
]
4815+
48534816
[[package]]
48544817
name = "tokio-tcp"
48554818
version = "0.1.3"
@@ -4866,25 +4829,26 @@ dependencies = [
48664829

48674830
[[package]]
48684831
name = "tokio-threadpool"
4869-
version = "0.1.10"
4832+
version = "0.1.16"
48704833
source = "registry+https://github.com/rust-lang/crates.io-index"
4871-
checksum = "17465013014410310f9f61fa10bf4724803c149ea1d51efece131c38efca93aa"
4834+
checksum = "2bd2c6a3885302581f4401c82af70d792bb9df1700e7437b0aeb4ada94d5388c"
48724835
dependencies = [
4873-
"crossbeam-channel",
4874-
"crossbeam-deque 0.6.3",
4836+
"crossbeam-deque 0.7.1",
4837+
"crossbeam-queue",
48754838
"crossbeam-utils 0.6.5",
48764839
"futures",
4840+
"lazy_static 1.3.0",
48774841
"log",
48784842
"num_cpus",
4879-
"rand 0.6.1",
4843+
"slab",
48804844
"tokio-executor",
48814845
]
48824846

48834847
[[package]]
48844848
name = "tokio-timer"
4885-
version = "0.2.8"
4849+
version = "0.2.12"
48864850
source = "registry+https://github.com/rust-lang/crates.io-index"
4887-
checksum = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
4851+
checksum = "1739638e364e558128461fc1ad84d997702c8e31c2e6b18fb99842268199e827"
48884852
dependencies = [
48894853
"crossbeam-utils 0.6.5",
48904854
"futures",
@@ -4894,9 +4858,9 @@ dependencies = [
48944858

48954859
[[package]]
48964860
name = "tokio-udp"
4897-
version = "0.1.3"
4861+
version = "0.1.5"
48984862
source = "registry+https://github.com/rust-lang/crates.io-index"
4899-
checksum = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
4863+
checksum = "f02298505547f73e60f568359ef0d016d5acd6e830ab9bc7c4a5b3403440121b"
49004864
dependencies = [
49014865
"bytes",
49024866
"futures",

0 commit comments

Comments
 (0)