Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-24 06:59:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge #753 #754 #764

Browse Source 
753: Bump thiserror from 1.0.28 to 1.0.29 r=rishflab a=dependabot[bot]

Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.28 to 1.0.29.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/dtolnay/thiserror/releases">thiserror's releases</a>.</em></p>
<blockquote>
<h2>1.0.29</h2>
<ul>
<li>
<p>Support error types containing generic type parameters (<a href="https://github-redirect.dependabot.com/dtolnay/thiserror/issues/148">#148</a>, <a href="https://github-redirect.dependabot.com/dtolnay/thiserror/issues/149">#149</a>, <a href="https://github-redirect.dependabot.com/dtolnay/thiserror/issues/150">#150</a>, <a href="https://github-redirect.dependabot.com/dtolnay/thiserror/issues/151">#151</a>)</p>
<pre lang="rust"><code>use thiserror::Error;
<p>#[derive(Error, Debug)]
pub enum MyError&lt;E, F, G&gt; {
#[error(&quot;thing {0} ({0:?})&quot;)]
Variant(E),
#[error(&quot;some error&quot;)]
Delegate(#[source] SomeError&lt;F&gt;),
#[error(&quot;err 0o{val:o}&quot;)]
Octal { val: G },
}
</code></pre></p>
<p>In the above example, thiserror would automatically generate the following pair of generic trait impls.</p>
<pre lang="rust"><code>impl&lt;E, F, G&gt; std::error::Error for MyError&lt;E, F, G&gt;
where
    SomeError&lt;F&gt;: std::error::Error + 'static,
    Self: std::fmt::Debug + std::fmt::Display;
<p>impl&lt;E, F, G&gt; std::fmt::Display for MyError&lt;E, F, G&gt;
where
E: std::fmt::Debug + std::fmt::Display,
G: std::fmt::Octal;
</code></pre></p>
</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="c7dd271dcd"><code>c7dd271</code></a> Release 1.0.29</li>
<li><a href="4b581e3fb9"><code>4b581e3</code></a> Skip a redundant Member clone</li>
<li><a href="19a15cb0c7"><code>19a15cb</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/dtolnay/thiserror/issues/152">#152</a> from dtolnay/bounds</li>
<li><a href="f688fd7009"><code>f688fd7</code></a> Handle multiple bounds from the same format string on the same field</li>
<li><a href="113fcaa225"><code>113fcaa</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/dtolnay/thiserror/issues/151">#151</a> from dtolnay/bounds</li>
<li><a href="72abba6f04"><code>72abba6</code></a> Deduplicate inferred bounds</li>
<li><a href="34f5931ada"><code>34f5931</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/dtolnay/thiserror/issues/150">#150</a> from dtolnay/bounds</li>
<li><a href="cc65053651"><code>cc65053</code></a> Implied bounds for the remaining std::fmt traits</li>
<li><a href="0a1c5bd7bb"><code>0a1c5bd</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/dtolnay/thiserror/issues/149">#149</a> from dtolnay/bound</li>
<li><a href="3e699aa43b"><code>3e699aa</code></a> Implied bounds for transparent attribute</li>
<li>Additional commits viewable in <a href="https://github.com/dtolnay/thiserror/compare/1.0.28...1.0.29">compare view</a></li>
</ul>
</details>
<br />


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

You can trigger a rebase of this PR 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>

754: Bump serde_with from 1.9.4 to 1.10.0 r=rishflab a=dependabot[bot]

Bumps [serde_with](https://github.com/jonasbb/serde_with) from 1.9.4 to 1.10.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/jonasbb/serde_with/releases">serde_with's releases</a>.</em></p>
<blockquote>
<h2>serde_with v1.10.0</h2>
<h3>Added</h3>
<ul>
<li>
<p>Add <code>BorrowCow</code> which instructs serde to borrow data during deserialization of <code>Cow&lt;'_, str&gt;</code>, <code>Cow&lt;'_, [u8]&gt;</code>, or <code>Cow&lt;'_, [u8; N]&gt;</code>. (<a href="https://github-redirect.dependabot.com/jonasbb/serde_with/issues/347">#347</a>)
The implementation is for <a href="https://github-redirect.dependabot.com/serde-rs/serde/pull/2072#pullrequestreview-735511713">serde#2072</a> and <a href="https://github-redirect.dependabot.com/serde-rs/serde/issues/2016">serde#2016</a>, about <code>#[serde(borrow)]</code> not working for <code>Option&lt;Cow&lt;'a, str&gt;&gt;</code>.</p>
<pre lang="rust"><code>#[serde_as]
#[derive(Deserialize, Serialize)]
struct Data&lt;'a&gt; {
    #[serde_as(as = &quot;Option&lt;[BorrowCow; 1]&gt;&quot;)]
    nested: Option&lt;[Cow&lt;'a, str&gt;; 1]&gt;,
}
</code></pre>
<p>The <code>#[serde(borrow)]</code> annotation is automatically added by the <code>#[serde_as]</code> attribute.</p>
</li>
</ul>
<h2>Changed</h2>
<ul>
<li>Bump MSRV to 1.46, since the dev-dependency bitflags requires that version now.</li>
<li><code>flattened_maybe!</code> no longer requires the <code>serde_with</code> crate to be available with a specific name.
This allows renaming the crate or using <code>flattened_maybe!</code> through a re-export without any complications.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/jonasbb/serde_with/blob/master/CHANGELOG.md">serde_with's changelog</a>.</em></p>
<blockquote>
<h2>[1.10.0] - 2021-09-04</h2>
<h3>Added</h3>
<ul>
<li>
<p>Add <code>BorrowCow</code> which instructs serde to borrow data during deserialization of <code>Cow&lt;'_, str&gt;</code>, <code>Cow&lt;'_, [u8]&gt;</code>, or <code>Cow&lt;'_, [u8; N]&gt;</code>. (<a href="https://github-redirect.dependabot.com/jonasbb/serde_with/issues/347">#347</a>)
The implementation is for <a href="https://github-redirect.dependabot.com/serde-rs/serde/pull/2072#pullrequestreview-735511713">serde#2072</a> and <a href="https://github-redirect.dependabot.com/serde-rs/serde/issues/2016">serde#2016</a>, about <code>#[serde(borrow)]</code> not working for <code>Option&lt;Cow&lt;'a, str&gt;&gt;</code>.</p>
<pre lang="rust"><code>#[serde_as]
#[derive(Deserialize, Serialize)]
struct Data&lt;'a&gt; {
    #[serde_as(as = &quot;Option&lt;[BorrowCow; 1]&gt;&quot;)]
    nested: Option&lt;[Cow&lt;'a, str&gt;; 1]&gt;,
}
</code></pre>
<p>The <code>#[serde(borrow)]</code> annotation is automatically added by the <code>#[serde_as]</code> attribute.</p>
</li>
</ul>
<h2>Changed</h2>
<ul>
<li>Bump MSRV to 1.46, since the dev-dependency bitflags requires that version now.</li>
<li><code>flattened_maybe!</code> no longer requires the <code>serde_with</code> crate to be available with a specific name.
This allows renaming the crate or using <code>flattened_maybe!</code> through a re-export without any complications.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="4087080599"><code>4087080</code></a> Merge <a href="https://github-redirect.dependabot.com/jonasbb/serde_with/issues/358">#358</a></li>
<li><a href="ed3abe27a9"><code>ed3abe2</code></a> Release new versions</li>
<li><a href="b35bd81c3a"><code>b35bd81</code></a> Merge <a href="https://github-redirect.dependabot.com/jonasbb/serde_with/issues/356">#356</a></li>
<li><a href="9ebccbfa5a"><code>9ebccbf</code></a> Restructure the serde_as documentation</li>
<li><a href="fbb2ad6ecd"><code>fbb2ad6</code></a> Merge <a href="https://github-redirect.dependabot.com/jonasbb/serde_with/issues/357">#357</a></li>
<li><a href="522c58a543"><code>522c58a</code></a> <code>--test-threads 1</code> is broken on tarpaulin 0.18.1</li>
<li><a href="d1ccf6d998"><code>d1ccf6d</code></a> Merge <a href="https://github-redirect.dependabot.com/jonasbb/serde_with/issues/354">#354</a></li>
<li><a href="1c4982b3cf"><code>1c4982b</code></a> Update changelog</li>
<li><a href="011c778565"><code>011c778</code></a> Merge <a href="https://github-redirect.dependabot.com/jonasbb/serde_with/issues/353">#353</a></li>
<li><a href="50e23b1813"><code>50e23b1</code></a> Fix even more typos</li>
<li>Additional commits viewable in <a href="https://github.com/jonasbb/serde_with/compare/v1.9.4...v1.10.0">compare view</a></li>
</ul>
</details>
<br />


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

You can trigger a rebase of this PR 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>

764: Bump sha2 from 0.9.6 to 0.9.8 r=rishflab a=dependabot[bot]

Bumps [sha2](https://github.com/RustCrypto/hashes) from 0.9.6 to 0.9.8.
<details>
<summary>Commits</summary>
<ul>
<li><a href="a7431da030"><code>a7431da</code></a> release sha2 v0.9.8 (<a href="https://github-redirect.dependabot.com/RustCrypto/hashes/issues/318">#318</a>)</li>
<li><a href="93d895de72"><code>93d895d</code></a> sha2: Fix bug in the AVX2 backend (<a href="https://github-redirect.dependabot.com/RustCrypto/hashes/issues/314">#314</a>)</li>
<li><a href="726e3c3978"><code>726e3c3</code></a> Release sha2 v0.9.7 (<a href="https://github-redirect.dependabot.com/RustCrypto/hashes/issues/313">#313</a>)</li>
<li><a href="efda00dd6b"><code>efda00d</code></a> Add x86 intrinsics support for sha2-512 (<a href="https://github-redirect.dependabot.com/RustCrypto/hashes/issues/312">#312</a>)</li>
<li>See full diff in <a href="https://github.com/RustCrypto/hashes/compare/sha2-v0.9.6...sha2-v0.9.8">compare view</a></li>
</ul>
</details>
<br />


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

You can trigger a rebase of this PR 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>
This commit is contained in:
bors[bot] 2021-09-15 03:21:48 +00:00 committed by GitHub
commit 89c35bdb61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Cargo.lock generated
View File

@ -3555,9 +3555,9 @@ dependencies = [
[[package]]
name = "serde_with"
version = "1.9.4"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ad9fdbb69badc8916db738c25efd04f0a65297d26c2f8de4b62e57b8c12bc72"
checksum = "062b87e45d8f26714eacfaef0ed9a583e2bfd50ebd96bdd3c200733bd5758e2c"
dependencies = [
"rustversion",
"serde",
@ -3566,9 +3566,9 @@ dependencies = [
[[package]]
name = "serde_with_macros"
version = "1.4.2"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1569374bd54623ec8bd592cf22ba6e03c0f177ff55fbc8c29a49e296e7adecf"
checksum = "98c1fcca18d55d1763e1c16873c4bde0ac3ef75179a28c7b372917e0494625be"
dependencies = [
"darling",
"proc-macro2",
@ -3613,9 +3613,9 @@ dependencies = [
[[package]]
name = "sha2"
version = "0.9.6"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9204c41a1597a8c5af23c82d1c921cb01ec0a4c59e07a9c7306062829a3903f3"
checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
dependencies = [
"block-buffer",
"cfg-if 1.0.0",
@ -4043,18 +4043,18 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.28"
version = "1.0.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "283d5230e63df9608ac7d9691adc1dfb6e701225436eb64d0b9a7f0a5a04f6ec"
checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.28"
version = "1.0.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa3884228611f5cd3608e2d409bf7dce832e4eb3135e3f11addbd7e41bd68e71"
checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c"
dependencies = [
"proc-macro2",
"quote",