Skip to content

Commit

Permalink
Undo MSRV bump
Browse files Browse the repository at this point in the history
  • Loading branch information
Amanieu committed Aug 28, 2021
1 parent 18001b8 commit aecb031
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Expand Up @@ -16,11 +16,11 @@ jobs:
strategy:
matrix:
os: [ubuntu, macos, windows]
channel: [1.49.0, stable, beta, nightly]
channel: [1.41.0, stable, beta, nightly]
feature: [arc_lock, serde, deadlock_detection]
exclude:
- feature: deadlock_detection
channel: '1.49.0'
channel: '1.41.0'
include:
- channel: nightly
feature: nightly
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -132,7 +132,7 @@ changes to the core API do not cause breaking changes for users of `parking_lot`

## Minimum Rust version

The current minimum required Rust version is 1.36. Any change to this is
The current minimum required Rust version is 1.41. Any change to this is
considered a breaking change and will require a major version bump.

## License
Expand Down
2 changes: 1 addition & 1 deletion core/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "parking_lot_core"
version = "0.8.4"
version = "0.8.5"
authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
description = "An advanced API for creating custom synchronization primitives."
license = "Apache-2.0/MIT"
Expand Down
4 changes: 2 additions & 2 deletions core/src/spinwait.rs
Expand Up @@ -6,14 +6,14 @@
// copied, modified, or distributed except according to those terms.

use crate::thread_parker;
use std::hint;
use std::sync::atomic::spin_loop_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 {
hint::spin_loop()
spin_loop_hint()
}
}

Expand Down

0 comments on commit aecb031

Please sign in to comment.