Skip to content

Commit

Permalink
Merge #370
Browse files Browse the repository at this point in the history
370: Update pretty_assertions requirement from 0.7.1 to 1.0.0 r=jonasbb a=dependabot[bot]

Updates the requirements on [pretty_assertions](https://github.com/colin-kiegel/rust-pretty-assertions) to permit the latest version.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/colin-kiegel/rust-pretty-assertions/releases">pretty_assertions's releases</a>.</em></p>
<blockquote>
<h2>v1.0.0</h2>
<p><strong>Note:</strong> As <code>pretty_assertions</code> has in practice had a stable API for several years, this feature release takes the opportunity to increment the version to <code>1.0.0</code> instead of <code>0.8.0</code>. No breaking changes are expected.</p>
<h2>Removed</h2>
<ul>
<li><code>assert_ne</code> no longer warns if values match using <code>PartialEq</code> but not with <code>Debug</code>. This was noted as no longer being necessary after Rust 1.25 (current MSRV 1.35.0)</li>
</ul>
<h2>Added</h2>
<ul>
<li>Officially support <code>no_std</code> (thanks to <a href="https://github.com/Luro02"><code>`@​Luro02</code></a>` for the report and reviews!). Adds the <code>std</code> and <code>alloc</code> features to the <code>pretty_assertions</code> crate, with <code>std</code> enabled by default (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/pull/83">#83</a>, <a href="https://github.com/tommilligan"><code>`@​tommilligan</code></a>)</li>`
<li>Adds the <code>unstable</code> feature to the <code>pretty_assertions</code> crate, for use with nightly rustc (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/pull/81">#81</a>, <a href="https://github.com/tommilligan"><code>`@​tommilligan</code></a>)</li>`
<li>Add a drop in replacement for the unstable stdlib <code>assert_matches</code> macro, behind the <code>unstable</code> flag - thanks <a href="https://github.com/gilescope"><code>`@​gilescope</code></a>` for the suggestion! (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/81">#81</a>, <a href="https://github.com/tommilligan"><code>`@​tommilligan</code></a>)</li>`
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/colin-kiegel/rust-pretty-assertions/blob/main/CHANGELOG.md">pretty_assertions's changelog</a>.</em></p>
<blockquote>
<h1>v1.0.0</h1>
<h2>Removed</h2>
<ul>
<li><code>assert_ne</code> no longer warns if values match using <code>PartialEq</code> but not with <code>Debug</code>. This was noted as no longer being necessary after Rust 1.25 (current MSRV 1.35.0)</li>
</ul>
<h2>Added</h2>
<ul>
<li>Officially support <code>no_std</code> (thanks to <a href="https://github.com/Luro02"><code>`@​Luro02</code></a>` for the report and reviews!). Adds the <code>std</code> and <code>alloc</code> features to the <code>pretty_assertions</code> crate, with <code>std</code> enabled by default (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/pull/83">#83</a>, <a href="https://github.com/tommilligan"><code>`@​tommilligan</code></a>)</li>`
<li>Adds the <code>unstable</code> feature to the <code>pretty_assertions</code> crate, for use with nightly rustc (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/pull/81">#81</a>, <a href="https://github.com/tommilligan"><code>`@​tommilligan</code></a>)</li>`
<li>Add a drop in replacement for the unstable stdlib <code>assert_matches</code> macro, behind the <code>unstable</code> flag - thanks <a href="https://github.com/gilescope"><code>`@​gilescope</code></a>` for the suggestion! (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/81">#81</a>, <a href="https://github.com/tommilligan"><code>`@​tommilligan</code></a>)</li>`
</ul>
<h1>v0.7.2</h1>
<ul>
<li>Fix macro hygiene for expansion in a <code>no_implicit_prelude</code> context (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/70">#70</a>, <a href="https://github.com/tommilligan"><code>`@​tommilligan</code></a>)</li>`
</ul>
<h1>v0.7.1</h1>
<ul>
<li>Fix a bug where multiline changes showed an unhelpful inline diff (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/66">#66</a>, <a href="https://github.com/tommilligan"><code>`@​tommilligan</code></a>)</li>`
</ul>
<h1>v0.7.0</h1>
<h2>Changed</h2>
<ul>
<li>Move from <code>difference</code> to <code>diff</code> for calculating diffs. The exact assertion messages generated may differ from previous versions. (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/52">#52</a>, <a href="https://github.com/tommilligan"><code>`@​tommilligan</code></a>)</li>`
</ul>
<p>For example, the following assertion message from <code>v0.7.0</code>:</p>
<p><img src="https://raw.githubusercontent.com/colin-kiegel/rust-pretty-assertions/2d2357ff56d22c51a86b2f1cfe6efcee9f5a8081/examples/pretty_assertion.png" alt="pretty assertion" /></p>
<p>Was previously rendered like this in <code>v0.6.1</code>:</p>
<p><img src="https://raw.githubusercontent.com/colin-kiegel/rust-pretty-assertions/2d2357ff56d22c51a86b2f1cfe6efcee9f5a8081/examples/pretty_assertion_v0_6_1.png" alt="pretty assertion" /></p>
<h2>Added</h2>
<ul>
<li>Support for unsized values (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/42">#42</a>, <a href="https://github.com/stanislav-tkach"><code>`@​stanislav-tkach</code></a>)</li>`
<li>Document the <code>Comparison</code> struct, which was previously hidden. This can be used to generate a pretty diff of two values without panicking. (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/52">#52</a>, <a href="https://github.com/tommilligan"><code>`@​tommilligan</code></a>)</li>`
</ul>
<h2>Fixed</h2>
<ul>
<li>Fix some unhygenic macro expansions (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/41">#41</a>, <a href="https://github.com/tommilligan"><code>`@​tommilligan</code></a>)</li>`
</ul>
<h2>Internal</h2>
<ul>
<li>Test Windows targets in CI (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/46">#46</a>, <a href="https://github.com/tommilligan"><code>`@​tommilligan</code></a>)</li>`
<li>Bump <code>ansi_term</code> version to 0.12 (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/34">#34</a>, <a href="https://github.com/waywardmonkeys"><code>`@​waywardmonkeys</code></a>)</li>`
<li>Code health improvements (<a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/34">#34</a>, <a href="https://github.com/waywardmonkeys"><code>`@​waywardmonkeys</code></a>)</li>`
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/colin-kiegel/rust-pretty-assertions/commit/737c8618dbc6f2a2c2e6ae7967d9996c562b5fe8"><code>737c861</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/83">#83</a> from tommilligan/assert-eq-no-std</li>
<li><a href="https://github.com/colin-kiegel/rust-pretty-assertions/commit/659b66b5949bffff7d7628ea787d6d37167d804f"><code>659b66b</code></a> chore: prepare for v1.0.0 release</li>
<li><a href="https://github.com/colin-kiegel/rust-pretty-assertions/commit/0a32464d34416648587886129318f72a9f2f0332"><code>0a32464</code></a> feat: fix and test for no_std with alloc</li>
<li><a href="https://github.com/colin-kiegel/rust-pretty-assertions/commit/9ef3e0dba7fd642088df23bc564b1851b17c8bbd"><code>9ef3e0d</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/81">#81</a> from tommilligan/assert-matches</li>
<li><a href="https://github.com/colin-kiegel/rust-pretty-assertions/commit/d084599aa0a2c5166fec5169eefd4c5255339cc0"><code>d084599</code></a> chore: update tarpaulin version</li>
<li><a href="https://github.com/colin-kiegel/rust-pretty-assertions/commit/799d2b25c39574141b30ea5ca0b2c7405184cc2e"><code>799d2b2</code></a> feature: add assert_matches as unstable feature</li>
<li><a href="https://github.com/colin-kiegel/rust-pretty-assertions/commit/55f9b7ad80818db56a9a40d466e20799cba6f371"><code>55f9b7a</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/78">#78</a> from tommilligan/test-macro-integrate</li>
<li><a href="https://github.com/colin-kiegel/rust-pretty-assertions/commit/c45600cf06af5735b7d7e2315d6e770ca2b770e8"><code>c45600c</code></a> chore: make macro tests external</li>
<li><a href="https://github.com/colin-kiegel/rust-pretty-assertions/commit/9746ead08a5ef1045de61de2fe3e469e57f57f70"><code>9746ead</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/colin-kiegel/rust-pretty-assertions/issues/77">#77</a> from tommilligan/fix-bench-std</li>
<li><a href="https://github.com/colin-kiegel/rust-pretty-assertions/commit/a9ba6c285c7db863b61144952e0fb1649d3d13a1"><code>a9ba6c2</code></a> bench: fix std comparison benchmarks</li>
<li>Additional commits viewable in <a href="https://github.com/colin-kiegel/rust-pretty-assertions/compare/v0.7.1...v1.0.0">compare view</a></li>
</ul>
</details>
<br />


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] authored Oct 2, 2021
2 parents 07a4822 + 0e6bb1b commit d054cb8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion serde_with/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ expect-test = "1.0.0"
fnv = "1.0.6"
glob = "0.3.0"
mime = "0.3.16"
pretty_assertions = "0.7.1"
pretty_assertions = "1.0.0"
regex = {version = "1.3.9", default-features = false, features = ["std"]}
ron = "0.6"
serde-xml-rs = "0.5.0"
Expand Down
2 changes: 1 addition & 1 deletion serde_with_macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ features = [
version = "1.0.3"

[dev-dependencies]
pretty_assertions = "0.7.1"
pretty_assertions = "1.0.0"
rustversion = "1.0.0"
serde = {version = "1.0.75", features = ["derive"]}
serde_json = "1.0.25"
Expand Down

0 comments on commit d054cb8

Please sign in to comment.