Commit Graph

369 Commits

Author SHA1 Message Date
bors[bot] 769cfdfb7f
Merge #175
175: iir: document r=jordens a=jordens



Co-authored-by: Robert Jördens <rj@quartiq.de>
2020-11-23 14:01:23 +00:00
Robert Jördens 6808d32e0f iir: document 2020-11-23 08:49:30 +01:00
bors[bot] c91e395d12
Merge #174
174: move iir to new dsp crate r=jordens a=matthuszagh

As mentioned [here](https://github.com/quartiq/stabilizer/pull/173#issuecomment-731751931).

Co-authored-by: Matt Huszagh <huszaghmatt@gmail.com>
2020-11-22 18:36:24 +00:00
Matt Huszagh d24dfb302e dsp crate: drop version dependency and remove boilerplate from cargo 2020-11-22 10:32:40 -08:00
Matt Huszagh 3eb43c6b99 move iir to new dsp crate 2020-11-22 07:59:12 -08:00
Robert Jördens a7b6b5c796
README: remove CI badge, add matrix link 2020-11-16 17:36:16 +01:00
Robert Jördens 04a0462aad
README: add matrix badge 2020-11-16 17:33:14 +01:00
Sebastien Bourdeauducq 920d08c04c update cargosha256 2020-11-11 15:22:47 +08:00
Ryan Summers e0020f4a2a
Merge pull request #159 from quartiq/rs/hal-update
Utilize mainline stm32h7xx-hal
2020-11-10 16:53:00 +01:00
Ryan Summers f164a1a89e Update PR 2020-11-10 15:31:19 +01:00
Ryan Summers a32ca39ca0 Removing spaces 2020-11-10 15:19:44 +01:00
Ryan Summers 84e31ef036 Fixing directive position 2020-11-10 15:16:37 +01:00
Ryan Summers 7b86a2bc42 Adding comment about deprecation allowance 2020-11-10 15:14:49 +01:00
Ryan Summers c804312e60 Fixing deprecation warnings 2020-11-10 15:13:57 +01:00
Ryan Summers 514314dced Merge branch 'master' into rs/hal-update 2020-11-10 15:13:12 +01:00
Robert Jördens bdbda8766d
Merge pull request #164 from vertigo-designs/feature/pr-ci
Adding CI support for PRs
2020-11-05 09:13:28 +01:00
Ryan Summers f1ee9a2af5 Adding CI support for PRs 2020-11-05 08:13:55 +01:00
Ryan Summers bab9fbf5ac Merge branch 'master' into rs/hal-update 2020-11-05 08:09:45 +01:00
Ryan Summers 2e9fdd9d4d Updating stm32h7xx-hal 2020-11-05 08:06:42 +01:00
bors[bot] f38c58ab53
Merge #162
162: added gateway r=ryan-summers a=nkuh

Fixes #158 

Co-authored-by: Niklas Kuhrmeyer <niklas.kuhrmeyer@ptb.de>
2020-10-30 12:37:45 +00:00
Niklas Kuhrmeyer 2f5d26aeaa decreased routes_storage 2020-10-30 13:33:59 +01:00
Niklas Kuhrmeyer 32d5e4dfe1 format 2020-10-30 13:32:47 +01:00
Niklas Kuhrmeyer dfe3ac877a added gateway 2020-10-30 12:16:28 +01:00
Ryan Summers f56487401c Adding updates for PHY support 2020-10-28 16:14:48 +01:00
Ryan Summers 11ff93e6f0 Fixing diff 2020-10-28 15:57:14 +01:00
Ryan Summers e36b853dc8 Renaming clocks to ccdr 2020-10-28 15:51:08 +01:00
Ryan Summers b4eeeb2042 Reverting unneeded changes 2020-10-28 15:44:52 +01:00
Ryan Summers c058d4bcde Adding updates for 0.8.0 of the HAL 2020-10-28 15:41:27 +01:00
Ryan Summers 17c8e4d2e1 Updating to new HAL 2020-10-26 16:58:29 +01:00
Ryan Summers dac6f73d5e WIP updates 2020-10-19 17:12:02 +02:00
Sebastien Bourdeauducq 66c917b576 update cargosha256 2020-10-08 14:42:58 +08:00
bors[bot] e4b4d7af7c
Merge #142
142: Make stabilizer.py work on v0.4.0+ r=jordens a=HarryMakes

This is a "dirty" fix to have `stabilizer.py` working with the new API since v0.4.0, by applying the new JSON format for the IIRs as follows:

```json
{
    "req": "Write",
    "attribute": "stabilizer/iir?/state",
    "value": {
        "channel":1,
        "iir":{
            "ba":[b0,b1,b2,a1,a2],
            "y_offset":?,
            "y_min":?,
            "y_max":?
         }
    }
}
```

The actual ASCII data sent will convert the innermost `"` to `'`, then wrap the curly-bracketed tree of `value` with `"`.


Co-authored-by: Harry Ho <hh@m-labs.hk>
2020-09-16 07:39:52 +00:00
Sebastien Bourdeauducq 2029757c4e update cargosha256 2020-09-16 15:36:10 +08:00
bors[bot] df238454c9
Merge #144
144: Fix syntax for taking core peripherals (required by cortex-m-rtic v0.5.5) r=jordens a=HarryMakes

This is to fix a panicking upon initialization problem that is caused by a now undefined behaviour in our code from the perspective of the latest release of the cortex-m-rtic crate. 

As per conversation in https://github.com/rtic-rs/cortex-m-rtic/issues/361, `context.core` should now be used instead of `cortex_m::Peripherals::take()`, which would cause some unexpected behaviour.

On a side note, a similar symptom where the Ethernet PHY does not get reset, as discussed in #141, might have also arisen from this new version of rtic. However, the reset delay still seems a bit too short to me.

Co-authored-by: Harry Ho <hh@m-labs.hk>
2020-09-16 06:59:29 +00:00
Harry Ho a979bf94dc update syntax for taking core periphs (required since rtic v0.5.5) 2020-09-16 14:25:36 +08:00
Harry Ho 7e2d240e85 make stabilizer.py work on v0.4.0+ 2020-09-15 15:49:55 +08:00
bors[bot] 1a95f53717
Merge #134
134: build(deps): bump cortex-m-rt from 0.6.12 to 0.6.13 r=jordens a=dependabot[bot]

Bumps [cortex-m-rt](https://github.com/rust-embedded/cortex-m-rt) from 0.6.12 to 0.6.13.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/rust-embedded/cortex-m-rt/blob/v0.6.13/CHANGELOG.md">cortex-m-rt's changelog</a>.</em></p>
<blockquote>
<h2>[v0.6.13] - 2020-09-07</h2>
<h3>Fixed</h3>
<ul>
<li>(ARMv6-M) Set LR value to a known value on reset (as the ARM spec requires)</li>
<li>Added CFI and size info to external assembly subroutines (<code>HardFaultTrampoline</code>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="833f9a4056"><code>833f9a4</code></a> Merge <a href="https://github-redirect.dependabot.com/rust-embedded/cortex-m-rt/issues/296">#296</a></li>
<li><a href="3103b5ca88"><code>3103b5c</code></a> Bump to 0.6.13</li>
<li><a href="9e6ee34305"><code>9e6ee34</code></a> Merge <a href="https://github-redirect.dependabot.com/rust-embedded/cortex-m-rt/issues/295">#295</a></li>
<li><a href="b785bcec5d"><code>b785bce</code></a> update changelog</li>
<li><a href="880827e1d0"><code>880827e</code></a> add CFI and size info to external assembly</li>
<li><a href="2907763115"><code>2907763</code></a> Merge <a href="https://github-redirect.dependabot.com/rust-embedded/cortex-m-rt/issues/292">#292</a></li>
<li><a href="c9c9aa02f7"><code>c9c9aa0</code></a> fix compile-fail test</li>
<li><a href="6afc21a7c1"><code>6afc21a</code></a> [ARMv6-M] initialize the LR register</li>
<li>See full diff in <a href="https://github.com/rust-embedded/cortex-m-rt/compare/v0.6.12...v0.6.13">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=cortex-m-rt&package-manager=cargo&previous-version=0.6.12&new-version=0.6.13)](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)

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>
2020-09-12 06:09:12 +00:00
Sebastien Bourdeauducq 47617fafd1 update cargosha256 2020-09-11 22:30:18 +08:00
Sebastien Bourdeauducq 1552bb4a3b update cargosha256 2020-09-11 19:56:59 +08:00
bors[bot] 6b1ade7bb4
Merge #138
138: Cargo.toml: fix stm32h7xx-hal override r=jordens a=sbourdeauducq

Doing it via dependencies.stm32h7xx-hal causes cargo vendor to fail with:

error: failed to sync

Caused by:
  found duplicate version of package `stm32h7xx-hal v0.5.0` vendored from two sources:

        source 1: registry `https://github.com/rust-lang/crates.io-index`
        source 2: https://github.com/quartiq/stm32h7xx-hal.git?branch=feature/pounder-support#ff00e938

Co-authored-by: Sebastien Bourdeauducq <sb@m-labs.hk>
2020-09-11 10:37:54 +00:00
Sebastien Bourdeauducq 4a95b6e2b0 Cargo.toml: fix stm32h7xx-hal override
Doing it via dependencies.stm32h7xx-hal causes cargo vendor to fail with:

error: failed to sync

Caused by:
  found duplicate version of package `stm32h7xx-hal v0.5.0` vendored from two sources:

        source 1: registry `https://github.com/rust-lang/crates.io-index`
        source 2: https://github.com/quartiq/stm32h7xx-hal.git?branch=feature/pounder-support#ff00e938
2020-09-11 18:34:15 +08:00
Sebastien Bourdeauducq 4a607e63f2 update cargoSha256 2020-09-11 18:33:07 +08:00
dependabot[bot] f1c053efe0
build(deps): bump cortex-m-rt from 0.6.12 to 0.6.13
Bumps [cortex-m-rt](https://github.com/rust-embedded/cortex-m-rt) from 0.6.12 to 0.6.13.
- [Release notes](https://github.com/rust-embedded/cortex-m-rt/releases)
- [Changelog](https://github.com/rust-embedded/cortex-m-rt/blob/v0.6.13/CHANGELOG.md)
- [Commits](https://github.com/rust-embedded/cortex-m-rt/compare/v0.6.12...v0.6.13)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-08 04:02:38 +00:00
bors[bot] d5916c5501
Merge #133
133: build(deps): bump cortex-m-rtic from 0.5.4 to 0.5.5 r=jordens a=dependabot[bot]

Bumps [cortex-m-rtic](https://github.com/rtic-rs/cortex-m-rtic) from 0.5.4 to 0.5.5.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/rtic-rs/cortex-m-rtic/blob/master/CHANGELOG.md">cortex-m-rtic's changelog</a>.</em></p>
<blockquote>
<h2>[v0.5.5] - 2020-08-27</h2>
<ul>
<li>Includes the previous soundness fix.</li>
<li>Fixes wrong use of the <code>cortex_m</code> crate which can cause some projects to stop compiling.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/rtic-rs/cortex-m-rtic/commits">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=cortex-m-rtic&package-manager=cargo&previous-version=0.5.4&new-version=0.5.5)](https://help.github.com/articles/configuring-automated-security-fixes)

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>
2020-08-28 06:44:52 +00:00
dependabot[bot] 989aefc2b6
build(deps): bump cortex-m-rtic from 0.5.4 to 0.5.5
Bumps [cortex-m-rtic](https://github.com/rtic-rs/cortex-m-rtic) from 0.5.4 to 0.5.5.
- [Release notes](https://github.com/rtic-rs/cortex-m-rtic/releases)
- [Changelog](https://github.com/rtic-rs/cortex-m-rtic/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rtic-rs/cortex-m-rtic/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-08-28 04:15:56 +00:00
bors[bot] 420e57e84b
Merge #131
131: build(deps): bump mcp23017 from `a3d0727` to `61933f8` r=jordens a=dependabot[bot]

Bumps [mcp23017](https://github.com/mrd0ll4r/mcp23017) from `a3d0727` to `61933f8`.
<details>
<summary>Commits</summary>
<ul>
<li><a href="61933f857a"><code>61933f8</code></a> fix miscalculation in read_gpioab due to missing parentheses</li>
<li>See full diff in <a href="a3d072754a...61933f857a">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>
2020-08-27 10:50:52 +00:00
bors[bot] 9c7cf99351
Merge #132
132: build(deps): bump cortex-m-rtic from 0.5.3 to 0.5.4 r=jordens a=dependabot[bot]

Bumps [cortex-m-rtic](https://github.com/rtic-rs/cortex-m-rtic) from 0.5.3 to 0.5.4.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/rtic-rs/cortex-m-rtic/blob/master/CHANGELOG.md">cortex-m-rtic's changelog</a>.</em></p>
<blockquote>
<h2>[v0.5.4] - 2020-08-26</h2>
<ul>
<li><strong>Soundness fix in RTIC</strong>, it was previously possible to get the <code>cortex_m::Peripherals</code> more than once, causing UB.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="312331de58"><code>312331d</code></a> Merge <a href="https://github-redirect.dependabot.com/rtic-rs/cortex-m-rtic/issues/350">#350</a></li>
<li><a href="5711a2472d"><code>5711a24</code></a> Preparing for 0.5.4 release</li>
<li><a href="846aa5062f"><code>846aa50</code></a> Merge <a href="https://github-redirect.dependabot.com/rtic-rs/cortex-m-rtic/issues/341">#341</a></li>
<li><a href="877d945870"><code>877d945</code></a> Try system QEMU</li>
<li><a href="5a23fb3bd3"><code>5a23fb3</code></a> Use ubuntu-20.04 (actual latest)</li>
<li><a href="6df6db40d8"><code>6df6db4</code></a> Trigger CI rerun</li>
<li><a href="2bde8af214"><code>2bde8af</code></a> Remove arm-none-eabi-gcc</li>
<li><a href="82220d21f7"><code>82220d2</code></a> Try running with cargo-binutils</li>
<li><a href="f77226af16"><code>f77226a</code></a> Merge <a href="https://github-redirect.dependabot.com/rtic-rs/cortex-m-rtic/issues/340">#340</a></li>
<li><a href="6ea8f6a06a"><code>6ea8f6a</code></a> Merge <a href="https://github-redirect.dependabot.com/rtic-rs/cortex-m-rtic/issues/344">#344</a></li>
<li>Additional commits viewable in <a href="https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.3...v0.5.4">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=cortex-m-rtic&package-manager=cargo&previous-version=0.5.3&new-version=0.5.4)](https://help.github.com/articles/configuring-automated-security-fixes)

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>
2020-08-27 10:42:13 +00:00
dependabot[bot] 30b3cf6861
build(deps): bump cortex-m-rtic from 0.5.3 to 0.5.4
Bumps [cortex-m-rtic](https://github.com/rtic-rs/cortex-m-rtic) from 0.5.3 to 0.5.4.
- [Release notes](https://github.com/rtic-rs/cortex-m-rtic/releases)
- [Changelog](https://github.com/rtic-rs/cortex-m-rtic/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.3...v0.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-08-27 04:15:36 +00:00
dependabot[bot] 7169c9e1d0
build(deps): bump mcp23017 from `a3d0727` to `61933f8`
Bumps [mcp23017](https://github.com/mrd0ll4r/mcp23017) from `a3d0727` to `61933f8`.
- [Release notes](https://github.com/mrd0ll4r/mcp23017/releases)
- [Commits](a3d072754a...61933f857a)

Signed-off-by: dependabot[bot] <support@github.com>
2020-08-26 04:14:34 +00:00
bors[bot] 9a904b43c4
Merge #130
130: build(deps): bump serde from 1.0.114 to 1.0.115 r=jordens a=dependabot[bot]

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.114 to 1.0.115.
<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.115</h2>
<ul>
<li>Support <code>#[serde(flatten)]</code> on a field whose type is a type parameter and concrete type is <code>()</code> (<a href="https://github-redirect.dependabot.com/serde-rs/serde/issues/1873">#1873</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="2ef60b62ac"><code>2ef60b6</code></a> Release 1.0.115</li>
<li><a href="e6f086d85e"><code>e6f086d</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/serde-rs/serde/issues/1874">#1874</a> from dtolnay/flatunit</li>
<li><a href="bf76f50294"><code>bf76f50</code></a> Support deserializing flattened unit</li>
<li><a href="ba07075590"><code>ba07075</code></a> Support serializing flattened unit</li>
<li><a href="26186bddd1"><code>26186bd</code></a> Add test for flattened unit</li>
<li><a href="53b9871b17"><code>53b9871</code></a> Quote no longer requires high recursion</li>
<li><a href="f8787c3ca8"><code>f8787c3</code></a> Suppress match_like_matches_macro clippy lint</li>
<li><a href="3022064f84"><code>3022064</code></a> Suppress option_if_let_else clippy pedantic lint</li>
<li><a href="9e140a2071"><code>9e140a2</code></a> Tweak yaml format blurb</li>
<li><a href="24e6acbfae"><code>24e6acb</code></a> Drop 'help or discussion' issue template</li>
<li>Additional commits viewable in <a href="https://github.com/serde-rs/serde/compare/v1.0.114...v1.0.115">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.114&new-version=1.0.115)](https://help.github.com/articles/configuring-automated-security-fixes)

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>
2020-08-11 13:08:27 +00:00