Skip to content

Commit

Permalink
Upgrade dependencies and minimum CI version
Browse files Browse the repository at this point in the history
  • Loading branch information
Amanieu committed Aug 27, 2021
1 parent c866ba8 commit 5539f7e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
strategy:
matrix:
os: [ubuntu, macos, windows]
channel: [1.41.0, stable, beta, nightly]
channel: [1.49.0, stable, beta, nightly]
feature: [arc_lock, serde, deadlock_detection]
exclude:
- feature: deadlock_detection
channel: '1.41.0'
channel: '1.49.0'
include:
- channel: nightly
feature: nightly
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ edition = "2018"
[dependencies]
parking_lot_core = { path = "core", version = "0.8.0" }
lock_api = { path = "lock_api", version = "0.4.0" }
instant = "0.1.4"
instant = "0.1.9"

[dev-dependencies]
rand = "0.7.3"
rand = "0.8.3"

# Used when testing out serde support.
bincode = "1.3.0"
bincode = "1.3.3"

[features]
default = []
Expand Down
12 changes: 6 additions & 6 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ edition = "2018"
cfg-if = "1.0.0"
smallvec = "1.6.1"
petgraph = { version = "0.5.1", optional = true }
thread-id = { version = "3.3.0", optional = true }
backtrace = { version = "0.3.49", optional = true }
instant = "0.1.4"
thread-id = { version = "4.0.0", optional = true }
backtrace = { version = "0.3.60", optional = true }
instant = "0.1.9"

[target.'cfg(unix)'.dependencies]
libc = "0.2.71"
libc = "0.2.95"

[target.'cfg(target_os = "redox")'.dependencies]
redox_syscall = "0.2.4"
redox_syscall = "0.2.8"

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3.8", features = ["winnt", "ntstatus", "minwindef",
winapi = { version = "0.3.9", features = ["winnt", "ntstatus", "minwindef",
"winerror", "winbase", "errhandlingapi", "handleapi"] }

[features]
Expand Down
4 changes: 2 additions & 2 deletions core/src/spinwait.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
// copied, modified, or distributed except according to those terms.

use crate::thread_parker;
use std::sync::atomic::spin_loop_hint;
use std::hint;

// Wastes some CPU time for the given number of iterations,
// using a hint to indicate to the CPU that we are spinning.
#[inline]
fn cpu_relax(iterations: u32) {
for _ in 0..iterations {
spin_loop_hint()
hint::spin_loop()
}
}

Expand Down
2 changes: 1 addition & 1 deletion lock_api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ owning_ref = { version = "0.4.1", optional = true }
# Optional dependency for supporting serde. Optional crates automatically
# create a feature with the same name as the crate, so if you need serde
# support, just pass "--features serde" when building this crate.
serde = { version = "1.0.114", default-features = false, optional = true }
serde = { version = "1.0.126", default-features = false, optional = true }

[features]
nightly = []
Expand Down

0 comments on commit 5539f7e

Please sign in to comment.