diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-27 13:29:20 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-27 13:29:20 +0000 |
commit | 7a1dc435cff6330b1855993c6a04ca57db6134ec (patch) | |
tree | fa1a5e9169b3c7e7ccb1a1a9faa97aa94225df01 | |
parent | d8bfad9e926636b7fe2a6aec28760508ffd47fdb (diff) | |
parent | 4017966a0b9b76e5dfae6bbac398c277a3ea98ad (diff) |
Merge #342
342: Bump parking_lot from 0.6.4 to 0.7.0 r=matklad a=dependabot[bot]
Bumps [parking_lot](https://github.com/Amanieu/parking_lot) from 0.6.4 to 0.7.0.
<details>
<summary>Changelog</summary>
*Sourced from [parking_lot's changelog](https://github.com/Amanieu/parking_lot/blob/master/CHANGELOG.md).*
> 0.7.0 (2018-11-20)
> ==================
>
> - Return if or how many threads were notified from `Condvar::notify_*`
>
> 0.6.3 (2018-07-18)
> ==================
>
> - Export `RawMutex`, `RawRwLock` and `RawThreadId`.
>
> 0.6.2 (2018-06-18)
> ==================
>
> - Enable `lock_api/nightly` feature from `parking_lot/nightly` ([#79](https://github-redirect.dependabot.com/Amanieu/parking_lot/issues/79))
>
> 0.6.1 (2018-06-08)
> ==================
>
> Added missing typedefs for mapped lock guards:
>
> - `MappedMutexGuard`
> - `MappedReentrantMutexGuard`
> - `MappedRwLockReadGuard`
> - `MappedRwLockWriteGuard`
>
> 0.6.0 (2018-06-08)
> ==================
>
> This release moves most of the code for type-safe `Mutex` and `RwLock` types
> into a separate crate called `lock_api`. This new crate is compatible with
> `no_std` and provides `Mutex` and `RwLock` type-safe wrapper types from a
> raw mutex type which implements the `RawMutex` or `RawRwLock` trait. The API
> provided by the wrapper types can be extended by implementing more traits on the
> raw mutex type which provide more functionality (e.g. `RawMutexTimed`). See the
> crate documentation for more details.
>
> There are also several major changes:
>
> - The minimum required Rust version is bumped to 1.26.
> - All methods on `MutexGuard` (and other guard types) are no longer inherent
> methods and must be called as `MutexGuard::method(self)`. This avoids
> conflicts with methods from the inner type.
> - `MutexGuard` (and other guard types) add the `unlocked` method which
> temporarily unlocks a mutex, runs the given closure, and then re-locks the
> mutex.
> - `MutexGuard` (and other guard types) add the `bump` method which gives a
> chance for other threads to acquire the mutex by temporarily unlocking it and
> re-locking it. However this is optimized for the common case where there are
> no threads waiting on the lock, in which case no unlocking is performed.
> - `MutexGuard` (and other guard types) add the `map` method which returns a
></table> ... (truncated)
</details>
<details>
<summary>Commits</summary>
- See full diff in [compare view](https://github.com/Amanieu/parking_lot/commits)
</details>
<br />
[](https://dependabot.com/compatibility-score.html?dependency-name=parking_lot&package-manager=cargo&previous-version=0.6.4&new-version=0.7.0)
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 | 8 | ||||
-rw-r--r-- | crates/ra_analysis/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_db/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_hir/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_syntax/Cargo.toml | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/Cargo.lock b/Cargo.lock index 84d49ad3f..a07791740 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -679,7 +679,7 @@ version = "0.1.0" | |||
679 | dependencies = [ | 679 | dependencies = [ |
680 | "fst 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", | 680 | "fst 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", |
681 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", | 681 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", |
682 | "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", | 682 | "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", |
683 | "ra_db 0.1.0", | 683 | "ra_db 0.1.0", |
684 | "ra_editor 0.1.0", | 684 | "ra_editor 0.1.0", |
685 | "ra_hir 0.1.0", | 685 | "ra_hir 0.1.0", |
@@ -709,7 +709,7 @@ name = "ra_db" | |||
709 | version = "0.1.0" | 709 | version = "0.1.0" |
710 | dependencies = [ | 710 | dependencies = [ |
711 | "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", | 711 | "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", |
712 | "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", | 712 | "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", |
713 | "ra_editor 0.1.0", | 713 | "ra_editor 0.1.0", |
714 | "ra_syntax 0.1.0", | 714 | "ra_syntax 0.1.0", |
715 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 715 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -740,7 +740,7 @@ dependencies = [ | |||
740 | "flexi_logger 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", | 740 | "flexi_logger 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", |
741 | "id-arena 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", | 741 | "id-arena 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", |
742 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", | 742 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", |
743 | "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", | 743 | "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", |
744 | "ra_db 0.1.0", | 744 | "ra_db 0.1.0", |
745 | "ra_editor 0.1.0", | 745 | "ra_editor 0.1.0", |
746 | "ra_syntax 0.1.0", | 746 | "ra_syntax 0.1.0", |
@@ -792,7 +792,7 @@ dependencies = [ | |||
792 | "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", | 792 | "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", |
793 | "drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", | 793 | "drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", |
794 | "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", | 794 | "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", |
795 | "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", | 795 | "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", |
796 | "ra_text_edit 0.1.0", | 796 | "ra_text_edit 0.1.0", |
797 | "rowan 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", | 797 | "rowan 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", |
798 | "test_utils 0.1.0", | 798 | "test_utils 0.1.0", |
diff --git a/crates/ra_analysis/Cargo.toml b/crates/ra_analysis/Cargo.toml index 4a7b99947..4db784538 100644 --- a/crates/ra_analysis/Cargo.toml +++ b/crates/ra_analysis/Cargo.toml | |||
@@ -11,7 +11,7 @@ rayon = "1.0.2" | |||
11 | fst = "0.3.1" | 11 | fst = "0.3.1" |
12 | salsa = "0.8.0" | 12 | salsa = "0.8.0" |
13 | rustc-hash = "1.0" | 13 | rustc-hash = "1.0" |
14 | parking_lot = "0.6.4" | 14 | parking_lot = "0.7.0" |
15 | ra_syntax = { path = "../ra_syntax" } | 15 | ra_syntax = { path = "../ra_syntax" } |
16 | ra_editor = { path = "../ra_editor" } | 16 | ra_editor = { path = "../ra_editor" } |
17 | ra_text_edit = { path = "../ra_text_edit" } | 17 | ra_text_edit = { path = "../ra_text_edit" } |
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml index 4be32b5f3..1fefd8025 100644 --- a/crates/ra_db/Cargo.toml +++ b/crates/ra_db/Cargo.toml | |||
@@ -9,7 +9,7 @@ backtrace = "0.3.1" | |||
9 | relative-path = "0.4.0" | 9 | relative-path = "0.4.0" |
10 | salsa = "0.8.0" | 10 | salsa = "0.8.0" |
11 | rustc-hash = "1.0" | 11 | rustc-hash = "1.0" |
12 | parking_lot = "0.6.4" | 12 | parking_lot = "0.7.0" |
13 | ra_syntax = { path = "../ra_syntax" } | 13 | ra_syntax = { path = "../ra_syntax" } |
14 | ra_editor = { path = "../ra_editor" } | 14 | ra_editor = { path = "../ra_editor" } |
15 | test_utils = { path = "../test_utils" } | 15 | test_utils = { path = "../test_utils" } |
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index 1350d51da..d719d69a3 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml | |||
@@ -10,7 +10,7 @@ log = "0.4.5" | |||
10 | relative-path = "0.4.0" | 10 | relative-path = "0.4.0" |
11 | salsa = "0.8.0" | 11 | salsa = "0.8.0" |
12 | rustc-hash = "1.0" | 12 | rustc-hash = "1.0" |
13 | parking_lot = "0.6.4" | 13 | parking_lot = "0.7.0" |
14 | id-arena = "2.0" | 14 | id-arena = "2.0" |
15 | ra_syntax = { path = "../ra_syntax" } | 15 | ra_syntax = { path = "../ra_syntax" } |
16 | ra_editor = { path = "../ra_editor" } | 16 | ra_editor = { path = "../ra_editor" } |
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml index 0c92b8407..fd6966d4a 100644 --- a/crates/ra_syntax/Cargo.toml +++ b/crates/ra_syntax/Cargo.toml | |||
@@ -12,7 +12,7 @@ arrayvec = "0.4.10" | |||
12 | unicode-xid = "0.1.0" | 12 | unicode-xid = "0.1.0" |
13 | itertools = "0.8.0" | 13 | itertools = "0.8.0" |
14 | drop_bomb = "0.1.4" | 14 | drop_bomb = "0.1.4" |
15 | parking_lot = "0.6.0" | 15 | parking_lot = "0.7.0" |
16 | rowan = "0.1.2" | 16 | rowan = "0.1.2" |
17 | text_unit = "0.1.5" | 17 | text_unit = "0.1.5" |
18 | ra_text_edit = { path = "../ra_text_edit" } | 18 | ra_text_edit = { path = "../ra_text_edit" } |