diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-31 08:46:47 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-31 08:46:47 +0000 |
commit | b4a7e73fc9d06e2bf95685d19acadacdd2c5204d (patch) | |
tree | 85b7b60b9b1b60135eef3d743047cf3515092cd7 | |
parent | e2816a95e94eb59fc875295ce7f3f547e95fe7b1 (diff) | |
parent | 2d9428b54ab63b47c98b8687b7fa1ec588c32045 (diff) |
Merge #381
381: Bump failure_derive from 0.1.3 to 0.1.4 r=DJMcNab a=dependabot[bot]
Bumps [failure_derive](https://github.com/withoutboats/failure_derive) from 0.1.3 to 0.1.4.
<details>
<summary>Commits</summary>
- See full diff in [compare view](https://github.com/withoutboats/failure_derive/commits)
</details>
<br />
[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=failure_derive&package-manager=cargo&previous-version=0.1.3&new-version=0.1.4)](https://dependabot.com/compatibility-score.html?dependency-name=failure_derive&package-manager=cargo&previous-version=0.1.3&new-version=0.1.4)
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 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 | 8 | ||||
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock index 39dd6a3cf..ec847ad89 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -274,12 +274,12 @@ version = "0.1.3" | |||
274 | source = "registry+https://github.com/rust-lang/crates.io-index" | 274 | source = "registry+https://github.com/rust-lang/crates.io-index" |
275 | dependencies = [ | 275 | dependencies = [ |
276 | "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", | 276 | "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", |
277 | "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", | 277 | "failure_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", |
278 | ] | 278 | ] |
279 | 279 | ||
280 | [[package]] | 280 | [[package]] |
281 | name = "failure_derive" | 281 | name = "failure_derive" |
282 | version = "0.1.3" | 282 | version = "0.1.4" |
283 | source = "registry+https://github.com/rust-lang/crates.io-index" | 283 | source = "registry+https://github.com/rust-lang/crates.io-index" |
284 | dependencies = [ | 284 | dependencies = [ |
285 | "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", | 285 | "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -747,7 +747,7 @@ dependencies = [ | |||
747 | "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", | 747 | "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", |
748 | "drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", | 748 | "drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", |
749 | "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", | 749 | "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", |
750 | "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", | 750 | "failure_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", |
751 | "flexi_logger 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", | 751 | "flexi_logger 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", |
752 | "gen_lsp_server 0.1.0", | 752 | "gen_lsp_server 0.1.0", |
753 | "im 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)", | 753 | "im 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1518,7 +1518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1518 | "checksum ena 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f56c93cc076508c549d9bb747f79aa9b4eb098be7b8cad8830c3137ef52d1e00" | 1518 | "checksum ena 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f56c93cc076508c549d9bb747f79aa9b4eb098be7b8cad8830c3137ef52d1e00" |
1519 | "checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02" | 1519 | "checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02" |
1520 | "checksum failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6dd377bcc1b1b7ce911967e3ec24fa19c3224394ec05b54aa7b083d498341ac7" | 1520 | "checksum failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6dd377bcc1b1b7ce911967e3ec24fa19c3224394ec05b54aa7b083d498341ac7" |
1521 | "checksum failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "64c2d913fe8ed3b6c6518eedf4538255b989945c14c2a7d5cbff62a5e2120596" | 1521 | "checksum failure_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c395a14ab27b42704e85bf2435c5c51f334ad7a96e16fe23c6e63a1cad6cc12" |
1522 | "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" | 1522 | "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" |
1523 | "checksum flexi_logger 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4dda06444ccc8b0a6da19d939989b4a4e83f328710ada449eedaed48c8b903cd" | 1523 | "checksum flexi_logger 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4dda06444ccc8b0a6da19d939989b4a4e83f328710ada449eedaed48c8b903cd" |
1524 | "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" | 1524 | "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" |
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index 22a26b844..bfab78be5 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
@@ -9,7 +9,7 @@ rayon = "1.0.2" | |||
9 | threadpool = "1.7.1" | 9 | threadpool = "1.7.1" |
10 | relative-path = "0.4.0" | 10 | 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.4" |
13 | serde_json = "1.0.24" | 13 | serde_json = "1.0.24" |
14 | serde = "1.0.83" | 14 | serde = "1.0.83" |
15 | drop_bomb = "0.1.0" | 15 | drop_bomb = "0.1.0" |