Skip to content
This repository has been archived by the owner on May 21, 2021. It is now read-only.

Commit

Permalink
Merge #17 #18
Browse files Browse the repository at this point in the history
17: build(deps): bump serde from 1.0.103 to 1.0.104 in /sync r=tommilligan a=dependabot-preview[bot]

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.103 to 1.0.104.
<details>
<summary>Release notes</summary>

*Sourced from [serde's releases](https://github.com/serde-rs/serde/releases).*

> ## v1.0.104
> - Revert stabilization of Serialize/Deserialize impls for `!` to account for [rust-lang/rust#67224](https://github-redirect.dependabot.com/rust-lang/rust/pull/67224)
</details>
<details>
<summary>Commits</summary>

- [`234fbfd`](serde-rs/serde@234fbfd) Release 1.0.104
- [`b9909ce`](serde-rs/serde@b9909ce) Revert "Remove never_type feature gate"
- [`d540e72`](serde-rs/serde@d540e72) Format with rustfmt 2019-10-07
- [`13d0899`](serde-rs/serde@13d0899) Add missing import in de_enum expand test
- [`4fefa7a`](serde-rs/serde@4fefa7a) Format imports in expandtest inputs
- [`9048660`](serde-rs/serde@9048660) Update test suite to nightly-2019-11-26
- [`0b303c7`](serde-rs/serde@0b303c7) Mark tests ignored on emscripten rather than omitting
- [`c371563`](serde-rs/serde@c371563) Reduce nesting of macrotest test cases
- [`d17d8eb`](serde-rs/serde@d17d8eb) Rely on std::process::Command's path search
- [`bcaebdb`](serde-rs/serde@bcaebdb) Merge pull request [#1662](https://github-redirect.dependabot.com/serde-rs/serde/issues/1662) from eupn/use-macrotest
- Additional commits viewable in [compare view](serde-rs/serde@v1.0.103...v1.0.104)
</details>
<br />

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

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 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 the `.dependabot/config.yml` file in this repo:
- Update frequency
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

18: build(deps): bump reqwest from 0.9.22 to 0.9.24 in /sync r=tommilligan a=dependabot-preview[bot]

Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.9.22 to 0.9.24.
<details>
<summary>Changelog</summary>

*Sourced from [reqwest's changelog](https://github.com/seanmonstar/reqwest/blob/v0.9.24/CHANGELOG.md).*

> ## v0.9.24
> 
> - Fix stray `dbg!` macro usage.
> 
> ## v0.9.23
> 
> - Fix when passing a `Url` that contains a username and password, extract it and send as basic authorizaton ([#715](https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/715)).
</details>
<details>
<summary>Commits</summary>

- [`bd36d53`](seanmonstar/reqwest@bd36d53) v0.9.24
- [`0e4d07f`](seanmonstar/reqwest@0e4d07f) remove stray dbg macro usage
- [`a9dc7a7`](seanmonstar/reqwest@a9dc7a7) v0.9.23
- [`6334345`](seanmonstar/reqwest@6334345) support url with authority ([#735](https://github-redirect.dependabot.com/seanmonstar/reqwest/issues/735))
- See full diff in [compare view](seanmonstar/reqwest@v0.9.22...v0.9.24)
</details>
<br />

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

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 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 the `.dependabot/config.yml` file in this repo:
- Update frequency
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- 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
tommilligan-bors[bot] and dependabot-preview[bot] authored Dec 16, 2019
3 parents a101b4e + 48032eb + d3fa39a commit 4dd6ed0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
32 changes: 16 additions & 16 deletions sync/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 sync/adonais_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ data-encoding = "2.1.2"
nom = { version = "5.0.1", optional = true }
pest = { version = "2.1.2", optional = true }
pest_derive = { version = "2.1.0", optional = true }
serde = "1.0.101"
serde = "1.0.104"
serde_derive = "1.0.101"
serde_json = "1.0.44"
siphasher = "0.3.1"
Expand Down
2 changes: 1 addition & 1 deletion sync/adonais_sync/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ edition = "2018"

[dependencies]
adonais_core = { path = "../adonais_core" }
reqwest = "0.9.20"
reqwest = "0.9.24"

0 comments on commit 4dd6ed0

Please sign in to comment.