Skip to content

Commit

Permalink
Merge #87 #88
Browse files Browse the repository at this point in the history
87: Bump clap from 2.33.3 to 2.34.0 r=pitkley a=dependabot[bot]

Bumps [clap](https://github.com/clap-rs/clap) from 2.33.3 to 2.34.0.
<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=2.33.3&new-version=2.34.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>

88: Bump serde from 1.0.130 to 1.0.131 r=pitkley a=dependabot[bot]

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.130 to 1.0.131.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/serde-rs/serde/releases">serde's releases</a>.</em></p>
<blockquote>
<h2>v1.0.131</h2>
<ul>
<li>Avoid <code>unused_results</code> being triggered in generated code for adjacently tagged enum (<a href="https://github-redirect.dependabot.com/serde-rs/serde/issues/2116">#2116</a>, thanks <a href="https://github.com/tyranron"><code>`@​tyranron</code></a>)</li>`
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/serde-rs/serde/commit/ab1ca04b2eaf8ec53d66d569008cd41a34426f88"><code>ab1ca04</code></a> Release 1.0.131</li>
<li><a href="https://github.com/serde-rs/serde/commit/fb2fe409c8f7ad6c95e3096e5e9ede865c8cfb49"><code>fb2fe40</code></a> Touch up PR 2116</li>
<li><a href="https://github.com/serde-rs/serde/commit/549fac7235e56ac9ac423fe4a613fdbfcb1c6f7a"><code>549fac7</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/serde-rs/serde/issues/2116">#2116</a> from tyranron/fix-unused-results</li>
<li><a href="https://github.com/serde-rs/serde/commit/c375d8b19b2c714d21acc040f65c669cfb943c2e"><code>c375d8b</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/serde-rs/serde/issues/2124">#2124</a> from dtolnay/cbor</li>
<li><a href="https://github.com/serde-rs/serde/commit/6cf507f8084c5cce4669cdb547a1a5342324160a"><code>6cf507f</code></a> Change cbor link to new repo</li>
<li><a href="https://github.com/serde-rs/serde/commit/c3c1641c06f4baaa06ce9627071a4f2169b770ec"><code>c3c1641</code></a> Remove workaround for redundant_field_names Clippy bug</li>
<li><a href="https://github.com/serde-rs/serde/commit/1fcda0ebdb2cfa050df42fded93ba07c14e4b683"><code>1fcda0e</code></a> Enable pedantic lints on test suite in CI</li>
<li><a href="https://github.com/serde-rs/serde/commit/8f16ac0a94a51adbbb6a602960d8ab2ecf3bd4cb"><code>8f16ac0</code></a> Move deny(clippy) to command line arguments in the CI job</li>
<li><a href="https://github.com/serde-rs/serde/commit/737f78c3156a23b9a0dd1affdee1e8b812f6ebac"><code>737f78c</code></a> Ignore enum_variant_names Clippy lint in test suite</li>
<li><a href="https://github.com/serde-rs/serde/commit/4a97386cb939224f6b0dfa7fcb10b6e2b5394538"><code>4a97386</code></a> Clippy if_then_panic lint has been renamed to manual_assert</li>
<li>Additional commits viewable in <a href="https://github.com/serde-rs/serde/compare/v1.0.130...v1.0.131">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=serde&package-manager=cargo&previous-version=1.0.130&new-version=1.0.131)](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>
  • Loading branch information
bors[bot] and dependabot[bot] committed Dec 16, 2021
3 parents c79dc05 + dca7039 + c332146 commit c000d9a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ include = [
maintenance = { status = "actively-developed" }

[dependencies]
clap = "^2.33"
clap = "^2.34"
dirs-next = "^2.0"
error-chain = "^0.12"
getch = "^0.2"
Expand All @@ -38,7 +38,7 @@ wait-timeout = "^0.2"
xdg = "^2.4"

[build-dependencies]
clap = "^2.33"
clap = "^2.34"

[dev-dependencies]
tempdir = "^0.3"
Expand Down

0 comments on commit c000d9a

Please sign in to comment.