aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-12-19 17:32:51 +0000
committerGitHub <[email protected]>2019-12-19 17:32:51 +0000
commit08c6933104baca84fd4135a76cdc7daf60a0c631 (patch)
tree5148e6320baed5cd61f7188fd7eb28fbb9809d0e
parent0000c7753ead95d71cb95ccc4929d4845f218ab2 (diff)
parent932d8050625359f6ac03bcbf2cd49aae728b520b (diff)
Merge #2601
2601: :arrow_up: deps r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--Cargo.lock48
-rw-r--r--xtask/src/main.rs2
2 files changed, 25 insertions, 25 deletions
diff --git a/Cargo.lock b/Cargo.lock
index af874945c..b7a5108a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -110,8 +110,8 @@ version = "0.9.1"
110source = "registry+https://github.com/rust-lang/crates.io-index" 110source = "registry+https://github.com/rust-lang/crates.io-index"
111dependencies = [ 111dependencies = [
112 "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", 112 "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
113 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 113 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
114 "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 114 "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
115 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", 115 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
116] 116]
117 117
@@ -433,7 +433,7 @@ dependencies = [
433 433
434[[package]] 434[[package]]
435name = "hermit-abi" 435name = "hermit-abi"
436version = "0.1.3" 436version = "0.1.5"
437source = "registry+https://github.com/rust-lang/crates.io-index" 437source = "registry+https://github.com/rust-lang/crates.io-index"
438dependencies = [ 438dependencies = [
439 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", 439 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -491,7 +491,7 @@ dependencies = [
491 "console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", 491 "console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
492 "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", 492 "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
493 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 493 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
494 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 494 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
495 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", 495 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
496 "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", 496 "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
497 "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", 497 "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -614,7 +614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
614dependencies = [ 614dependencies = [
615 "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 615 "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
616 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", 616 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
617 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 617 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
618 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", 618 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
619] 619]
620 620
@@ -624,7 +624,7 @@ version = "0.63.1"
624source = "registry+https://github.com/rust-lang/crates.io-index" 624source = "registry+https://github.com/rust-lang/crates.io-index"
625dependencies = [ 625dependencies = [
626 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", 626 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
627 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 627 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
628 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", 628 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
629 "serde_repr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 629 "serde_repr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
630 "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 630 "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -729,7 +729,7 @@ name = "num_cpus"
729version = "1.11.1" 729version = "1.11.1"
730source = "registry+https://github.com/rust-lang/crates.io-index" 730source = "registry+https://github.com/rust-lang/crates.io-index"
731dependencies = [ 731dependencies = [
732 "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", 732 "hermit-abi 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
733 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", 733 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
734] 734]
735 735
@@ -1059,7 +1059,7 @@ dependencies = [
1059 "ra_vfs_glob 0.1.0", 1059 "ra_vfs_glob 0.1.0",
1060 "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", 1060 "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1061 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1061 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1062 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 1062 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
1063 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", 1063 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
1064 "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1064 "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1065 "test_utils 0.1.0", 1065 "test_utils 0.1.0",
@@ -1107,7 +1107,7 @@ dependencies = [
1107 "ra_cfg 0.1.0", 1107 "ra_cfg 0.1.0",
1108 "ra_db 0.1.0", 1108 "ra_db 0.1.0",
1109 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1109 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1110 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 1110 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
1111 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", 1111 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
1112] 1112]
1113 1113
@@ -1123,7 +1123,7 @@ dependencies = [
1123 "rowan 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", 1123 "rowan 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
1124 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1124 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1125 "rustc_lexer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1125 "rustc_lexer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1126 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 1126 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
1127 "smol_str 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", 1127 "smol_str 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
1128 "test_utils 0.1.0", 1128 "test_utils 0.1.0",
1129 "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", 1129 "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1381,7 +1381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1381dependencies = [ 1381dependencies = [
1382 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", 1382 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
1383 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", 1383 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
1384 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 1384 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
1385] 1385]
1386 1386
1387[[package]] 1387[[package]]
@@ -1474,7 +1474,7 @@ version = "0.9.0"
1474source = "registry+https://github.com/rust-lang/crates.io-index" 1474source = "registry+https://github.com/rust-lang/crates.io-index"
1475dependencies = [ 1475dependencies = [
1476 "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", 1476 "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
1477 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 1477 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
1478] 1478]
1479 1479
1480[[package]] 1480[[package]]
@@ -1484,15 +1484,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1484 1484
1485[[package]] 1485[[package]]
1486name = "serde" 1486name = "serde"
1487version = "1.0.103" 1487version = "1.0.104"
1488source = "registry+https://github.com/rust-lang/crates.io-index" 1488source = "registry+https://github.com/rust-lang/crates.io-index"
1489dependencies = [ 1489dependencies = [
1490 "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 1490 "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
1491] 1491]
1492 1492
1493[[package]] 1493[[package]]
1494name = "serde_derive" 1494name = "serde_derive"
1495version = "1.0.103" 1495version = "1.0.104"
1496source = "registry+https://github.com/rust-lang/crates.io-index" 1496source = "registry+https://github.com/rust-lang/crates.io-index"
1497dependencies = [ 1497dependencies = [
1498 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", 1498 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1507,7 +1507,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1507dependencies = [ 1507dependencies = [
1508 "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", 1508 "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
1509 "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", 1509 "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
1510 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 1510 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
1511] 1511]
1512 1512
1513[[package]] 1513[[package]]
@@ -1527,7 +1527,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1527dependencies = [ 1527dependencies = [
1528 "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", 1528 "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
1529 "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", 1529 "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
1530 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 1530 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
1531 "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", 1531 "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
1532] 1532]
1533 1533
@@ -1546,7 +1546,7 @@ name = "smol_str"
1546version = "0.1.15" 1546version = "0.1.15"
1547source = "registry+https://github.com/rust-lang/crates.io-index" 1547source = "registry+https://github.com/rust-lang/crates.io-index"
1548dependencies = [ 1548dependencies = [
1549 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 1549 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
1550] 1550]
1551 1551
1552[[package]] 1552[[package]]
@@ -1662,7 +1662,7 @@ dependencies = [
1662 "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 1662 "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
1663 "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", 1663 "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
1664 "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1664 "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1665 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 1665 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
1666] 1666]
1667 1667
1668[[package]] 1668[[package]]
@@ -1671,7 +1671,7 @@ version = "0.8.1"
1671source = "registry+https://github.com/rust-lang/crates.io-index" 1671source = "registry+https://github.com/rust-lang/crates.io-index"
1672dependencies = [ 1672dependencies = [
1673 "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", 1673 "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
1674 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 1674 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
1675] 1675]
1676 1676
1677[[package]] 1677[[package]]
@@ -1749,7 +1749,7 @@ dependencies = [
1749 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", 1749 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
1750 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", 1750 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
1751 "ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", 1751 "ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
1752 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", 1752 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
1753 "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", 1753 "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
1754] 1754]
1755 1755
@@ -1816,7 +1816,7 @@ dependencies = [
1816"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" 1816"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
1817"checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" 1817"checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2"
1818"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" 1818"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
1819"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" 1819"checksum hermit-abi 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f629dc602392d3ec14bfc8a09b5e644d7ffd725102b48b81e59f90f2633621d7"
1820"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" 1820"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
1821"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" 1821"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
1822"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" 1822"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
@@ -1903,8 +1903,8 @@ dependencies = [
1903"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" 1903"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
1904"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" 1904"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
1905"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" 1905"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
1906"checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702" 1906"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
1907"checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0" 1907"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
1908"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7" 1908"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7"
1909"checksum serde_repr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "cd02c7587ec314570041b2754829f84d873ced14a96d1fd1823531e11db40573" 1909"checksum serde_repr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "cd02c7587ec314570041b2754829f84d873ced14a96d1fd1823531e11db40573"
1910"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" 1910"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index c52902bb5..4201c6a6a 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -20,7 +20,7 @@ use xtask::{
20}; 20};
21 21
22// Latest stable, feel free to send a PR if this lags behind. 22// Latest stable, feel free to send a PR if this lags behind.
23const REQUIRED_RUST_VERSION: u32 = 39; 23const REQUIRED_RUST_VERSION: u32 = 40;
24 24
25struct InstallOpt { 25struct InstallOpt {
26 client: Option<ClientOpt>, 26 client: Option<ClientOpt>,