diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-28 07:11:54 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-28 07:11:54 +0000 |
commit | 161054a616835ff5eebbc6692c8795c049b8b0d7 (patch) | |
tree | 6f649cf640bd5b5855310dec4c3ab6f470c60d96 | |
parent | e80021cbd0bcfea82f3b855e13a409c73b563673 (diff) | |
parent | 626badc30a5a5584e24f9401b163799772288079 (diff) |
Merge #349
349: Bump serde from 1.0.82 to 1.0.83 r=matklad a=dependabot[bot]
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.82 to 1.0.83.
<details>
<summary>Release notes</summary>
*Sourced from [serde's releases](https://github.com/serde-rs/serde/releases).*
> ## v1.0.83
> - Support a `rename_all` specification that applies only to the Serialize impl or only to the Deserialize impl ([#1447](https://github-redirect.dependabot.com/serde-rs/serde/issues/1447), thanks [**vincascm**](https://github.com/vincascm))
>
> ```rust
> #[derive(Serialize, Deserialize)]
> #[serde(rename_all(
> serialize = "camelCase",
> deserialize = "SCREAMING_SNAKE_CASE",
> ))]
> struct S { /* ... */ }
> ```
>
> - Allow serializing struct name inside of structs with named fields ([#1448](https://github-redirect.dependabot.com/serde-rs/serde/issues/1448), thanks [**motu42**](https://github.com/motu42))
>
> ```rust
> #[derive(Serialize)]
> #[serde(tag = "type")]
> struct S { /* ... */ } // serializes as {"type":"S",...}
> ```
</details>
<details>
<summary>Commits</summary>
- [`b1b9702`](https://github.com/serde-rs/serde/commit/b1b9702dafc41651b5736cb9ebad1f6389599300) Release 1.0.83
- [`32728d2`](https://github.com/serde-rs/serde/commit/32728d2f1def957605200be1ccf35b27bbe59e87) Format with rustfmt 2018-12-10
- [`807a097`](https://github.com/serde-rs/serde/commit/807a097387abe3db52b682232d714c5d31d97fb4) Fix spelling in ui test name
- [`794ee15`](https://github.com/serde-rs/serde/commit/794ee15386b07c6df55165a98499d743df2b804b) Merge pull request [#1448](https://github-redirect.dependabot.com/serde-rs/serde/issues/1448) from motu42/master
- [`2359417`](https://github.com/serde-rs/serde/commit/23594178040cb4cce46fedcbd149641955542652) Added ui tests, Limited serde(tag = "...") to structs with named field
- [`7950f3c`](https://github.com/serde-rs/serde/commit/7950f3cdc52d4898aa4195b853cbec12d65bb091) Format with rustfmt 2018-12-10
- [`b87f8f3`](https://github.com/serde-rs/serde/commit/b87f8f35ee631ff5fb8f01e0ebf5ad1f5148d369) Merge pull request 1447 from vincascm/master
- [`9e53405`](https://github.com/serde-rs/serde/commit/9e53405f43ad0e087dea7ed64ddafca0356c6560) Fix for rustc 1.15.0
- [`c6c1d8f`](https://github.com/serde-rs/serde/commit/c6c1d8fa869774afd32dc5250bb32f641f03cbba) Work around deprecation of str::trim_left_matches
- [`8aa5c2b`](https://github.com/serde-rs/serde/commit/8aa5c2b45dcebd5222593a97f3b50fa11212a74c) Removed deprected ui/enum-representation/internally-tagged-struct test
- Additional commits viewable in [compare view](https://github.com/serde-rs/serde/compare/v1.0.82...v1.0.83)
</details>
<br />
[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=serde&package-manager=cargo&previous-version=1.0.82&new-version=1.0.83)](https://dependabot.com/compatibility-score.html?dependency-name=serde&package-manager=cargo&previous-version=1.0.82&new-version=1.0.83)
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)
---
**Note:** This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.
You can always request more updates by clicking `Bump now` in your [Dependabot dashboard](https://app.dependabot.com).
<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 cancel merge` will cancel a previously requested merge
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major 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)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- 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)
Finally, you can contact us by mentioning @dependabot.
</details>
Co-authored-by: dependabot[bot] <[email protected]>
-rw-r--r-- | Cargo.lock | 26 | ||||
-rw-r--r-- | crates/gen_lsp_server/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/Cargo.lock b/Cargo.lock index 92c1cd683..9a45f4d57 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -117,7 +117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
117 | dependencies = [ | 117 | dependencies = [ |
118 | "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", | 118 | "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", |
119 | "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", | 119 | "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", |
120 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 120 | "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", |
121 | "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 121 | "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", |
122 | "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", | 122 | "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", |
123 | ] | 123 | ] |
@@ -351,7 +351,7 @@ dependencies = [ | |||
351 | "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", | 351 | "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", |
352 | "languageserver-types 0.53.1 (registry+https://github.com/rust-lang/crates.io-index)", | 352 | "languageserver-types 0.53.1 (registry+https://github.com/rust-lang/crates.io-index)", |
353 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", | 353 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", |
354 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 354 | "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", |
355 | "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", | 355 | "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", |
356 | ] | 356 | ] |
357 | 357 | ||
@@ -436,7 +436,7 @@ dependencies = [ | |||
436 | "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", | 436 | "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", |
437 | "num-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", | 437 | "num-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", |
438 | "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", | 438 | "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", |
439 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 439 | "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", |
440 | "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 440 | "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", |
441 | "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", | 441 | "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", |
442 | "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", | 442 | "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -773,7 +773,7 @@ dependencies = [ | |||
773 | "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", | 773 | "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", |
774 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 774 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
775 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 775 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
776 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 776 | "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", |
777 | "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", | 777 | "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", |
778 | "smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", | 778 | "smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", |
779 | "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", | 779 | "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -992,7 +992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
992 | dependencies = [ | 992 | dependencies = [ |
993 | "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", | 993 | "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", |
994 | "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", | 994 | "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", |
995 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 995 | "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", |
996 | ] | 996 | ] |
997 | 997 | ||
998 | [[package]] | 998 | [[package]] |
@@ -1080,7 +1080,7 @@ version = "0.9.0" | |||
1080 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1080 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1081 | dependencies = [ | 1081 | dependencies = [ |
1082 | "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1082 | "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1083 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 1083 | "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", |
1084 | ] | 1084 | ] |
1085 | 1085 | ||
1086 | [[package]] | 1086 | [[package]] |
@@ -1090,7 +1090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1090 | 1090 | ||
1091 | [[package]] | 1091 | [[package]] |
1092 | name = "serde" | 1092 | name = "serde" |
1093 | version = "1.0.82" | 1093 | version = "1.0.83" |
1094 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1094 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1095 | dependencies = [ | 1095 | dependencies = [ |
1096 | "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 1096 | "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1113,7 +1113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1113 | dependencies = [ | 1113 | dependencies = [ |
1114 | "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", | 1114 | "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", |
1115 | "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", | 1115 | "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", |
1116 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 1116 | "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", |
1117 | ] | 1117 | ] |
1118 | 1118 | ||
1119 | [[package]] | 1119 | [[package]] |
@@ -1148,7 +1148,7 @@ name = "smol_str" | |||
1148 | version = "0.1.8" | 1148 | version = "0.1.8" |
1149 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1149 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1150 | dependencies = [ | 1150 | dependencies = [ |
1151 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 1151 | "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", |
1152 | ] | 1152 | ] |
1153 | 1153 | ||
1154 | [[package]] | 1154 | [[package]] |
@@ -1232,7 +1232,7 @@ dependencies = [ | |||
1232 | "pest 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", | 1232 | "pest 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", |
1233 | "pest_derive 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1233 | "pest_derive 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1234 | "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1234 | "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1235 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 1235 | "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", |
1236 | "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", | 1236 | "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", |
1237 | "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", | 1237 | "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", |
1238 | "unic-segment 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1238 | "unic-segment 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1275,7 +1275,7 @@ name = "text_unit" | |||
1275 | version = "0.1.5" | 1275 | version = "0.1.5" |
1276 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1276 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1277 | dependencies = [ | 1277 | dependencies = [ |
1278 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 1278 | "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", |
1279 | ] | 1279 | ] |
1280 | 1280 | ||
1281 | [[package]] | 1281 | [[package]] |
@@ -1442,7 +1442,7 @@ name = "url_serde" | |||
1442 | version = "0.2.0" | 1442 | version = "0.2.0" |
1443 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1443 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1444 | dependencies = [ | 1444 | dependencies = [ |
1445 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 1445 | "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", |
1446 | "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", | 1446 | "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", |
1447 | ] | 1447 | ] |
1448 | 1448 | ||
@@ -1626,7 +1626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1626 | "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" | 1626 | "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" |
1627 | "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" | 1627 | "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" |
1628 | "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" | 1628 | "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" |
1629 | "checksum serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)" = "6fa52f19aee12441d5ad11c9a00459122bd8f98707cadf9778c540674f1935b6" | 1629 | "checksum serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)" = "157e12af46859e968da75dea9845530e13d03bcab2009a41b9b7bb3cf4eb3ec2" |
1630 | "checksum serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)" = "96a7f9496ac65a2db5929afa087b54f8fc5008dcfbe48a8874ed20049b0d6154" | 1630 | "checksum serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)" = "96a7f9496ac65a2db5929afa087b54f8fc5008dcfbe48a8874ed20049b0d6154" |
1631 | "checksum serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)" = "c37ccd6be3ed1fdf419ee848f7c758eb31b054d7cd3ae3600e3bae0adf569811" | 1631 | "checksum serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)" = "c37ccd6be3ed1fdf419ee848f7c758eb31b054d7cd3ae3600e3bae0adf569811" |
1632 | "checksum sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9d1f3b5de8a167ab06834a7c883bd197f2191e1dda1a22d9ccfeedbf9aded" | 1632 | "checksum sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9d1f3b5de8a167ab06834a7c883bd197f2191e1dda1a22d9ccfeedbf9aded" |
diff --git a/crates/gen_lsp_server/Cargo.toml b/crates/gen_lsp_server/Cargo.toml index 7022c858c..afeeb1513 100644 --- a/crates/gen_lsp_server/Cargo.toml +++ b/crates/gen_lsp_server/Cargo.toml | |||
@@ -12,5 +12,5 @@ languageserver-types = "0.53.1" | |||
12 | log = "0.4.3" | 12 | log = "0.4.3" |
13 | failure = "0.1.2" | 13 | failure = "0.1.2" |
14 | serde_json = "1.0.24" | 14 | serde_json = "1.0.24" |
15 | serde = { version = "1.0.71", features = ["derive"] } | 15 | serde = { version = "1.0.83", features = ["derive"] } |
16 | crossbeam-channel = "0.2.4" | 16 | crossbeam-channel = "0.2.4" |
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index 78c06c7f7..c53106a62 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
@@ -11,7 +11,7 @@ relative-path = "0.4.0" | |||
11 | failure = "0.1.2" | 11 | failure = "0.1.2" |
12 | failure_derive = "0.1.2" | 12 | failure_derive = "0.1.2" |
13 | serde_json = "1.0.24" | 13 | serde_json = "1.0.24" |
14 | serde = "1.0.71" | 14 | serde = "1.0.83" |
15 | drop_bomb = "0.1.0" | 15 | drop_bomb = "0.1.0" |
16 | crossbeam-channel = "0.2.4" | 16 | crossbeam-channel = "0.2.4" |
17 | flexi_logger = "0.10.0" | 17 | flexi_logger = "0.10.0" |