Browse Source

Merge #371

371: Bump clap from 3.0.0-beta.4 to 3.0.0-beta.5 r=da-kami a=dependabot[bot]

Bumps [clap](https://github.com/clap-rs/clap) from 3.0.0-beta.4 to 3.0.0-beta.5.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/clap-rs/clap/blob/master/CHANGELOG.md">clap's changelog</a>.</em></p>
<blockquote>
<h2>v3.0.0-beta.5 (2021-10-18)</h2>
<h4>BREAKING CHANGES</h4>
<ul>
<li><strong>Renamed Features</strong>
<ul>
<li><code>unicode_help</code> to <code>unicode</code> to encompass more functionality</li>
</ul>
</li>
<li><strong>Gated behind features</strong>
<ul>
<li><code>App::replace</code> is now gated behind <code>unstable-replace</code></li>
</ul>
</li>
<li><strong>Removed <code>derive</code> requirement</strong>
<ul>
<li><code>clap::ArgEnum</code></li>
<li><code>clap::Args</code></li>
<li><code>clap::FromArgMatches</code></li>
<li><code>clap::IntoApp</code></li>
<li><code>clap::Subcommand</code></li>
</ul>
</li>
<li><strong>Renamed Traits</strong>
<ul>
<li><code>clap::Clap</code> =&gt; <code>clap::Parser</code></li>
</ul>
</li>
<li><strong>Renamed Methods</strong>
<ul>
<li><code>App::generate_usage</code> =&gt; <code>App::render_usage</code></li>
</ul>
</li>
<li><strong>Removed Settings</strong>
<ul>
<li><code>AppSettings::DisableVersionForSubcommands</code> is now default behaviour</li>
<li><code>AppSettings::ColoredHelp</code>: we are now relying solely on the <code>color</code> feature flag and <code>App::color</code> method</li>
<li><code>AppSettings::StrictUtf8</code> is now default behaviour</li>
<li><code>AppSettings::AllowInvalidUtf8</code> in favor of <code>ArgSettings::AllowInvalidUtf8</code></li>
<li><code>AppSettings::UnifiedHelpMessage</code> is now default behaviour</li>
<li><code>AppSettings::ColorAlways</code> in favor of <code>App::color</code></li>
<li><code>AppSettings::ColorNever</code> in favor of <code>App::color</code></li>
<li><code>AppSettings::ColorAuto</code> in favor of <code>App::color</code></li>
</ul>
</li>
<li><strong>Removed methods</strong>
<ul>
<li><strong>App</strong>
<ul>
<li><code>App::get_flags</code></li>
<li><code>App::get_positionals_with_no_heading</code></li>
<li><code>App::get_flags_with_no_heading</code></li>
<li><code>App::get_opts_with_no_heading</code></li>
<li><code>App::stop_custom_headings</code> in favor of <code>App:help_heading(None)</code></li>
</ul>
</li>
<li><strong>Error</strong>
<ul>
<li><code>Error::with_description</code> in favor of <code>App::error</code></li>
</ul>
</li>
<li><strong>ArgEnum</strong>
<ul>
<li><code>ArgEnum::as_arg</code> in favor of <code>ArgEnum::to_arg_value</code></li>
</ul>
</li>
<li><strong>clap_generate::Generator</strong>
<ul>
<li><code>Generator::all_subcommands</code></li>
<li><code>Generator::find_subcommand_with_path</code></li>
<li><code>Generator::subcommands</code></li>
<li><code>Generator::shorts_and_visible_aliases</code></li>
<li><code>Generator::longs_and_visible_aliases</code></li>
<li><code>Generator::flags</code></li>
</ul>
</li>
</ul>
</li>
<li><strong>Removed</strong>
<ul>
<li><code>ArgEnum::VARIANTS</code> in favor of <code>ArgEnum::value_variants</code></li>
</ul>
</li>
<li><strong>Deprecated</strong>
<ul>
<li><code>clap::clap_app!</code> in favor of other builders</li>
</ul>
</li>
<li><strong>Changed</strong></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/clap-rs/clap/commits">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.4&new-version=3.0.0-beta.5)](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>
burn-down-handle
bors[bot] 3 years ago
committed by GitHub
parent
commit
200052c402
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 32
      Cargo.lock
  2. 2
      daemon/Cargo.toml
  3. 6
      daemon/src/maker.rs
  4. 6
      daemon/src/taker.rs

32
Cargo.lock

@ -444,9 +444,9 @@ dependencies = [
[[package]]
name = "clap"
version = "3.0.0-beta.4"
version = "3.0.0-beta.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406"
checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63"
dependencies = [
"atty",
"bitflags",
@ -457,14 +457,14 @@ dependencies = [
"strsim",
"termcolor",
"textwrap",
"vec_map",
"unicase",
]
[[package]]
name = "clap_derive"
version = "3.0.0-beta.4"
version = "3.0.0-beta.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b5bb0d655624a0b8770d1c178fb8ffcb1f91cc722cb08f451e3dc72465421ac"
checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3"
dependencies = [
"heck",
"proc-macro-error",
@ -1737,9 +1737,12 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
[[package]]
name = "os_str_bytes"
version = "3.1.0"
version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d"
checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799"
dependencies = [
"memchr",
]
[[package]]
name = "output_vt100"
@ -3488,6 +3491,15 @@ 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"
@ -3577,12 +3589,6 @@ version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "vec_map"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "vergen"
version = "5.1.16"

2
daemon/Cargo.toml

@ -11,7 +11,7 @@ bdk = { version = "0.12", default-features = false, features = ["sqlite", "elect
bytes = "1"
cfd_protocol = { path = "../cfd_protocol" }
chrono = { version = "0.4", features = ["serde"] }
clap = "3.0.0-beta.4"
clap = "3.0.0-beta.5"
futures = { version = "0.3", default-features = false }
hex = "0.4"
hkdf = "0.11"

6
daemon/src/maker.rs

@ -1,7 +1,7 @@
use anyhow::{Context, Result};
use bdk::bitcoin;
use bdk::bitcoin::secp256k1::schnorrsig;
use clap::Clap;
use clap::Parser;
use daemon::auth::{self, MAKER_USERNAME};
use daemon::db::{self};
@ -29,7 +29,7 @@ use xtra::Actor;
mod routes_maker;
#[derive(Clap)]
#[derive(Parser)]
struct Opts {
/// The port to listen on for p2p connections.
#[clap(long, default_value = "9999")]
@ -59,7 +59,7 @@ struct Opts {
network: Network,
}
#[derive(Clap)]
#[derive(Parser)]
enum Network {
/// Run on mainnet.
Mainnet {

6
daemon/src/taker.rs

@ -1,7 +1,7 @@
use anyhow::{Context, Result};
use bdk::bitcoin;
use bdk::bitcoin::secp256k1::schnorrsig;
use clap::Clap;
use clap::Parser;
use daemon::db::{self};
use daemon::model::WalletInfo;
@ -29,7 +29,7 @@ mod routes_taker;
pub const ANNOUNCEMENT_LOOKAHEAD: time::Duration = time::Duration::hours(24);
#[derive(Clap)]
#[derive(Parser)]
struct Opts {
/// The IP address of the other party (i.e. the maker).
#[clap(long, default_value = "127.0.0.1:9999")]
@ -55,7 +55,7 @@ struct Opts {
network: Network,
}
#[derive(Clap)]
#[derive(Parser)]
enum Network {
Mainnet {
/// URL to the electrum backend to use for the wallet.

Loading…
Cancel
Save