Browse Source

Merge #777 #778

777: Bump rust_decimal from 1.17.0 to 1.18.0 r=bonomat a=dependabot[bot]

Bumps [rust_decimal](https://github.com/paupino/rust-decimal) from 1.17.0 to 1.18.0.
<details>
<summary>Commits</summary>
<ul>
<li><a href="6766bafb3a"><code>6766baf</code></a> Version 1.18.0 (<a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/447">#447</a>)</li>
<li><a href="b4e72bccc0"><code>b4e72bc</code></a> Add MySQL support for Diesel (<a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/446">#446</a>)</li>
<li><a href="2f2d0fbe46"><code>2f2d0fb</code></a> Fixes integer handling in Decimal::to_f64 by expanding range (<a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/443">#443</a>)</li>
<li><a href="9b6a1cefe0"><code>9b6a1ce</code></a> Add support for Rocket forms (<a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/445">#445</a>)</li>
<li>See full diff in <a href="https://github.com/paupino/rust-decimal/compare/1.17.0...1.18.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=rust_decimal&package-manager=cargo&previous-version=1.17.0&new-version=1.18.0)](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>

778: Bump reqwest from 0.11.6 to 0.11.7 r=bonomat a=dependabot[bot]

Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.6 to 0.11.7.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/seanmonstar/reqwest/releases">reqwest's releases</a>.</em></p>
<blockquote>
<h2>v0.11.7</h2>
<ul>
<li>Add <code>blocking::ClientBuilder::resolve()</code> option, matching the async builder.</li>
<li>Implement <code>From&lt;tokio::fs::File&gt;</code> for <code>Body</code>.</li>
<li>Fix <code>blocking</code> request-scoped timeout applying to bodies as well.</li>
<li>(wasm) Fix request bodies using multipart vs formdata.</li>
<li>Update internal <code>rustls</code> to 0.20.</li>
</ul>
<h2>New Contributors ❤️</h2>
<ul>
<li><a href="https://github.com/jeschkies"><code>`@​jeschkies</code></a>` made their first contribution in <a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/pull/1362">seanmonstar/reqwest#1362</a></li>
<li><a href="https://github.com/niuhuan"><code>`@​niuhuan</code></a>` made their first contribution in <a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/pull/1384">seanmonstar/reqwest#1384</a></li>
<li><a href="https://github.com/BiagioFesta"><code>`@​BiagioFesta</code></a>` made their first contribution in <a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/pull/1388">seanmonstar/reqwest#1388</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md">reqwest's changelog</a>.</em></p>
<blockquote>
<h2>v0.11.7</h2>
<ul>
<li>Add <code>blocking::ClientBuilder::resolve()</code> option, matching the async builder.</li>
<li>Implement <code>From&lt;tokio::fs::File&gt;</code> for <code>Body</code>.</li>
<li>Fix <code>blocking</code> request-scoped timeout applying to bodies as well.</li>
<li>(wasm) Fix request bodies using multipart vs formdata.</li>
<li>Update internal <code>rustls</code> to 0.20.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="17890f8c2f"><code>17890f8</code></a> v0.11.7</li>
<li><a href="d73d961166"><code>d73d961</code></a> fix blocking client to use request timeout for response body (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1395">#1395</a>)</li>
<li><a href="8b37ae4b15"><code>8b37ae4</code></a> Support to rustls 0.20 (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1388">#1388</a>)</li>
<li><a href="8fe22c4885"><code>8fe22c4</code></a> Remove direct dependency on the time crate (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1390">#1390</a>)</li>
<li><a href="161d731892"><code>161d731</code></a> add resolve to blocking client (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1384">#1384</a>)</li>
<li><a href="0ef1a2ea78"><code>0ef1a2e</code></a> wasm: fix standalone/multipart body conversion to JsValue (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1364">#1364</a>)</li>
<li><a href="ab49de875e"><code>ab49de8</code></a> Body from tokio::fs::File (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1360">#1360</a>)</li>
<li><a href="be8ab7b951"><code>be8ab7b</code></a> docs: provide basic auth example (<a href="https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/1362">#1362</a>)</li>
<li>See full diff in <a href="https://github.com/seanmonstar/reqwest/compare/v0.11.6...v0.11.7">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=reqwest&package-manager=cargo&previous-version=0.11.6&new-version=0.11.7)](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>
no-buy-button-while-setting-up-cfd
bors[bot] 3 years ago
committed by GitHub
parent
commit
c39b0f3987
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 103
      Cargo.lock
  2. 2
      daemon/Cargo.toml

103
Cargo.lock

@ -792,7 +792,7 @@ dependencies = [
"serde",
"serde_json",
"socks",
"webpki",
"webpki 0.21.4",
"webpki-roots 0.19.0",
]
@ -1254,17 +1254,15 @@ dependencies = [
[[package]]
name = "hyper-rustls"
version = "0.22.1"
version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac"
dependencies = [
"futures-util",
"http",
"hyper",
"log",
"rustls 0.19.1",
"rustls 0.20.2",
"tokio",
"tokio-rustls",
"webpki",
"tokio-rustls 0.23.1",
]
[[package]]
@ -2269,9 +2267,9 @@ dependencies = [
[[package]]
name = "reqwest"
version = "0.11.6"
version = "0.11.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66d2927ca2f685faf0fc620ac4834690d29e7abb153add10f5812eef20b5e280"
checksum = "07bea77bc708afa10e59905c3d4af7c8fd43c9214251673095ff8b14345fcbc5"
dependencies = [
"base64 0.13.0",
"bytes",
@ -2289,12 +2287,13 @@ dependencies = [
"mime",
"percent-encoding",
"pin-project-lite",
"rustls 0.19.1",
"rustls 0.20.2",
"rustls-pemfile",
"serde",
"serde_json",
"serde_urlencoded",
"tokio",
"tokio-rustls",
"tokio-rustls 0.23.1",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
@ -2457,9 +2456,9 @@ dependencies = [
[[package]]
name = "rust_decimal"
version = "1.17.0"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "353775f96a1f400edcca737f843cb201af3645912e741e64456a257c770173e8"
checksum = "71b5a9625a7e6060b23db692facf49082cc78889a7e6ac94a735356ae49db4b0"
dependencies = [
"arrayvec",
"num-traits",
@ -2503,8 +2502,8 @@ dependencies = [
"base64 0.10.1",
"log",
"ring",
"sct",
"webpki",
"sct 0.6.1",
"webpki 0.21.4",
]
[[package]]
@ -2516,8 +2515,20 @@ dependencies = [
"base64 0.13.0",
"log",
"ring",
"sct",
"webpki",
"sct 0.6.1",
"webpki 0.21.4",
]
[[package]]
name = "rustls"
version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84"
dependencies = [
"log",
"ring",
"sct 0.7.0",
"webpki 0.22.0",
]
[[package]]
@ -2532,6 +2543,15 @@ dependencies = [
"security-framework",
]
[[package]]
name = "rustls-pemfile"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"
dependencies = [
"base64 0.13.0",
]
[[package]]
name = "rustversion"
version = "1.0.5"
@ -2594,6 +2614,16 @@ dependencies = [
"untrusted",
]
[[package]]
name = "sct"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
dependencies = [
"ring",
"untrusted",
]
[[package]]
name = "secp256k1"
version = "0.20.3"
@ -2970,7 +3000,7 @@ dependencies = [
"tokio-stream",
"url",
"uuid",
"webpki",
"webpki 0.21.4",
"webpki-roots 0.21.1",
"whoami",
]
@ -3005,7 +3035,7 @@ checksum = "0d1bd069de53442e7a320f525a6d4deb8bb0621ac7a55f7eccbc2b58b57f43d0"
dependencies = [
"once_cell",
"tokio",
"tokio-rustls",
"tokio-rustls 0.22.0",
]
[[package]]
@ -3234,7 +3264,18 @@ checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
dependencies = [
"rustls 0.19.1",
"tokio",
"webpki",
"webpki 0.21.4",
]
[[package]]
name = "tokio-rustls"
version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4baa378e417d780beff82bf54ceb0d195193ea6a00c14e22359e7f39456b5689"
dependencies = [
"rustls 0.20.2",
"tokio",
"webpki 0.22.0",
]
[[package]]
@ -3259,9 +3300,9 @@ dependencies = [
"pin-project",
"rustls 0.19.1",
"tokio",
"tokio-rustls",
"tokio-rustls 0.22.0",
"tungstenite",
"webpki",
"webpki 0.21.4",
"webpki-roots 0.21.1",
]
@ -3393,7 +3434,7 @@ dependencies = [
"thiserror",
"url",
"utf-8",
"webpki",
"webpki 0.21.4",
]
[[package]]
@ -3684,13 +3725,23 @@ dependencies = [
"untrusted",
]
[[package]]
name = "webpki"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
dependencies = [
"ring",
"untrusted",
]
[[package]]
name = "webpki-roots"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739"
dependencies = [
"webpki",
"webpki 0.21.4",
]
[[package]]
@ -3699,7 +3750,7 @@ version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
dependencies = [
"webpki",
"webpki 0.21.4",
]
[[package]]

2
daemon/Cargo.toml

@ -27,7 +27,7 @@ reqwest = { version = "0.11", default-features = false, features = ["json", "rus
rocket = { version = "0.5.0-rc.1", features = ["json"] }
rocket-basicauth = { version = "2", default-features = false }
rust-embed = "6.3"
rust_decimal = "1.17"
rust_decimal = "1.18"
rust_decimal_macros = "1.17"
serde = { version = "1", features = ["derive"] }
serde_json = "1"

Loading…
Cancel
Save