Browse Source

Merge #858

858: Bump clap from 3.0.0-beta.5 to 3.0.0-rc.1 r=thomaseizinger a=dependabot[bot]

Bumps [clap](https://github.com/clap-rs/clap) from 3.0.0-beta.5 to 3.0.0-rc.1.
<details>
<summary>Commits</summary>
<ul>
<li><a href="3dec7df14f"><code>3dec7df</code></a> chore: Release</li>
<li><a href="5a3ace8de4"><code>5a3ace8</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/clap-rs/clap/issues/3109">#3109</a> from epage/deprecate</li>
<li><a href="9d7becca68"><code>9d7becc</code></a> docs: Update deprecation messages</li>
<li><a href="4c807a0632"><code>4c807a0</code></a> docs(faq): Update structopt status</li>
<li><a href="91b5b395f5"><code>91b5b39</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/clap-rs/clap/issues/3105">#3105</a> from colinwahl/pack-exclusive-setting</li>
<li><a href="0b2a04c572"><code>0b2a04c</code></a> fix: Fix typo</li>
<li><a href="f396b28419"><code>f396b28</code></a> chore: Pack exclusive setting into ArgSettings</li>
<li><a href="1f465b57e3"><code>1f465b5</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/clap-rs/clap/issues/3104">#3104</a> from epage/unstable</li>
<li><a href="3b5c5c7879"><code>3b5c5c7</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/clap-rs/clap/issues/3101">#3101</a> from epage/features</li>
<li><a href="130a1dc0e2"><code>130a1dc</code></a> test: Actually allow unstable examples to be tested</li>
<li>Additional commits viewable in <a href="https://github.com/clap-rs/clap/compare/v3.0.0-beta.5...clap_generate-v3.0.0-rc.1">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=clap&package-manager=cargo&previous-version=3.0.0-beta.5&new-version=3.0.0-rc.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
resilient-broadcast
bors[bot] 3 years ago
committed by GitHub
parent
commit
458d15ee1c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 31
      Cargo.lock
  2. 2
      daemon/Cargo.toml

31
Cargo.lock

@ -425,9 +425,9 @@ dependencies = [
[[package]]
name = "clap"
version = "3.0.0-beta.5"
version = "3.0.0-rc.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63"
checksum = "c068998524e6d40ea78c8d2a4b00398f0a8b818c2d484bcb3cbeb2cff2c105ae"
dependencies = [
"atty",
"bitflags",
@ -438,14 +438,13 @@ dependencies = [
"strsim",
"termcolor",
"textwrap",
"unicase",
]
[[package]]
name = "clap_derive"
version = "3.0.0-beta.5"
version = "3.0.0-rc.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3"
checksum = "0152ba3ee01fa5a9133d4e15a1d9659c75d2270365768dd5a880cc7e68871874"
dependencies = [
"heck",
"proc-macro-error",
@ -1749,9 +1748,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
[[package]]
name = "os_str_bytes"
version = "4.2.0"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799"
checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
dependencies = [
"memchr",
]
@ -3155,9 +3154,6 @@ name = "textwrap"
version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
dependencies = [
"unicode-width",
]
[[package]]
name = "thiserror"
@ -3489,15 +3485,6 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c"
[[package]]
name = "unicase"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
dependencies = [
"version_check",
]
[[package]]
name = "unicode-bidi"
version = "0.3.6"
@ -3519,12 +3506,6 @@ version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
[[package]]
name = "unicode-width"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
[[package]]
name = "unicode-xid"
version = "0.2.2"

2
daemon/Cargo.toml

@ -10,7 +10,7 @@ atty = "0.2"
bdk = { version = "0.14.1-dev", default-features = false, features = ["electrum"] }
bytes = "1"
chrono = { version = "0.4", features = ["serde"] }
clap = "3.0.0-beta.5"
clap = { version = "3.0.0-rc.1", features = ["derive"] }
derive_more = { version = "0.99.17", default-features = false, features = ["display"] }
futures = { version = "0.3", default-features = false }
hex = "0.4"

Loading…
Cancel
Save