Skip to content
This repository has been archived by the owner on Jul 27, 2022. It is now read-only.

Commit

Permalink
Merge #2312
Browse files Browse the repository at this point in the history
2312: Bump nom from 5.1.2 to 6.0.0 r=tomtau a=dependabot-preview[bot]

Bumps [nom](https://github.com/Geal/nom) from 5.1.2 to 6.0.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/Geal/nom/blob/master/CHANGELOG.md">nom's changelog</a>.</em></p>
<blockquote>
<h2>6.0.0 - 2020-10-31</h2>
<h3>Thanks</h3>
<p>This release was done thanks to the hard work of (by order of appearance in the commit list):</p>
<ul>
<li><a href="https://github.com/chifflier">@chifflier</a></li>
<li><a href="https://github.com/shepmaster">@shepmaster</a></li>
<li><a href="https://github.com/amerelo">@amerelo</a></li>
<li><a href="https://github.com/razican">@razican</a></li>
<li><a href="https://github.com/Palladinium">@Palladinium</a></li>
<li><a href="https://github.com/0ndorio">@0ndorio</a></li>
<li>Sebastian Zivota</li>
<li><a href="https://github.com/keruspe">@keruspe</a></li>
<li><a href="https://github.com/devonhollowood">@devonhollowood</a></li>
<li><a href="https://github.com/parasyte">@parasyte</a></li>
<li><a href="https://github.com/nnt0">@nnt0</a></li>
<li><a href="https://github.com/AntoineCezar">@AntoineCezar</a></li>
<li><a href="https://github.com/GuillaumeGomez">@GuillaumeGomez</a></li>
<li><a href="https://github.com/eijebong">@eijebong</a></li>
<li><a href="https://github.com/stadelmanma">@stadelmanma</a></li>
<li><a href="https://github.com/sphynx">@sphynx</a></li>
<li><a href="https://github.com/snawaz">@snawaz</a></li>
<li><a href="https://github.com/fosskers">@fosskers</a></li>
<li><a href="https://github.com/JamesHarrison">@JamesHarrison</a></li>
<li><a href="https://github.com/calebsander">@calebsander</a></li>
<li><a href="https://github.com/jthornber">@jthornber</a></li>
<li><a href="https://github.com/ahmedcharles">@ahmedcharles</a></li>
<li><a href="https://github.com/rljacobson">@rljacobson</a></li>
<li><a href="https://github.com/benkay86">@benkay86</a></li>
<li><a href="https://github.com/georgeclaghorn">@georgeclaghorn</a></li>
<li><a href="https://github.com/TianyiShi2001">@TianyiShi2001</a></li>
<li><a href="https://github.com/shnewto">@shnewto</a></li>
<li><a href="https://github.com/alfriadox">@alfriadox</a></li>
<li><a href="https://github.com/resistor">@resistor</a></li>
<li><a href="https://github.com/myrrlyn">@myrrlyn</a></li>
<li><a href="https://github.com/chipsenkbeil">@chipsenkbeil</a></li>
<li><a href="https://github.com/ruza-net">@ruza-net</a></li>
<li><a href="https://github.com/fanf2">@fanf2</a></li>
<li><a href="https://github.com/jameysharp">@jameysharp</a></li>
<li><a href="https://github.com/FallenWarrior2k">@FallenWarrior2k</a></li>
<li><a href="https://github.com/jmg-duarte">@jmg-duarte</a></li>
<li><a href="https://github.com/ericseppanen">@ericseppanen</a></li>
<li><a href="https://github.com/hbina">@hbina</a></li>
<li>Andreas Molzer</li>
<li><a href="https://github.com/nickelc">@nickelc</a></li>
<li><a href="https://github.com/bgourlie">@bgourlie</a></li>
</ul>
<h2>Notable changes</h2>
<p>This release is a more polished version of nom 5, that came with a focus on</p>
<!-- raw HTML omitted -->
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/Geal/nom/commit/e7b080877adf0f021c4b2d53044fad7d3a88d18b"><code>e7b0808</code></a> v6.0.0</li>
<li><a href="https://github.com/Geal/nom/commit/77806c843c6830fd877cae6cc0c712c9900a367e"><code>77806c8</code></a> typo</li>
<li><a href="https://github.com/Geal/nom/commit/d20dd2165fc441744d5437700a13a993764bcc71"><code>d20dd21</code></a> v6.0.0-beta5</li>
<li><a href="https://github.com/Geal/nom/commit/2c2d889326c87a421103596cc8c25a6ccd7b0f23"><code>2c2d889</code></a> include the recipes module in the crate</li>
<li><a href="https://github.com/Geal/nom/commit/e8ea6509902f1d18e0e02ff1e5a4a249e72d63e5"><code>e8ea650</code></a> v6.0.0-beta4</li>
<li><a href="https://github.com/Geal/nom/commit/424eb0252033a4c5b8e3556926457737901a234b"><code>424eb02</code></a> update changelog</li>
<li><a href="https://github.com/Geal/nom/commit/317f5de3e522cbc64a29ad92bec88c6ce657a133"><code>317f5de</code></a> fix documentation features</li>
<li><a href="https://github.com/Geal/nom/commit/f5671af0002caad8a597b5ba86f8d46499f6bc63"><code>f5671af</code></a> remove some warnings</li>
<li><a href="https://github.com/Geal/nom/commit/8b6e30918044e028d9c05d8c1c757d997eab0083"><code>8b6e309</code></a> Re-export bitvec</li>
<li><a href="https://github.com/Geal/nom/commit/660ce62a7829269a14b8845f1ef9e23384940f12"><code>660ce62</code></a> the into! combinator should also convert the error type</li>
<li>Additional commits viewable in <a href="https://github.com/Geal/nom/compare/5.1.2...6.0.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=nom&package-manager=cargo&previous-version=5.1.2&new-version=6.0.0)](https://dependabot.com/compatibility-score/?dependency-name=nom&package-manager=cargo&previous-version=5.1.2&new-version=6.0.0)

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)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
  • Loading branch information
bors[bot] and dependabot-preview[bot] authored Nov 2, 2020
2 parents 59f060b + d91a07d commit db2909f
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 9 deletions.
64 changes: 56 additions & 8 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion chain-tx-enclave-next/mls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ring = { version = "0.16.15", features = ["std"] }
thiserror = "1.0"
rustls = "0.18"
x509-parser = "0.8.2"
nom = "5.1"
nom = "6.0"
secrecy = "0.7.0"
sha2 = "0.9"
hkdf = { version = "0.10", features = ["std"] }
Expand Down

0 comments on commit db2909f

Please sign in to comment.