Skip to content

Commit

Permalink
Merge #373
Browse files Browse the repository at this point in the history
373: Support Rust 1.26 r=stjepang a=jeehoonkang

Closes #365 

Remaining question: should we commit to support the minimum supported Rust version of Rayon?


Co-authored-by: Jeehoon Kang <jeehoon.kang@kaist.ac.kr>
  • Loading branch information
bors[bot] and jeehoonkang committed May 10, 2019
2 parents 6ac269b + b47e19b commit 7308fb3
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 14 deletions.
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@ matrix:
- rust: 1.28.0
name: "crossbeam on 1.28.0"
script: ./ci/crossbeam.sh
- rust: 1.28.0
name: "crossbeam-channel on 1.28.0"
- rust: 1.26.0
name: "crossbeam-channel on 1.26.0"
script: ./ci/crossbeam-channel.sh
- rust: 1.28.0
name: "crossbeam-deque on 1.28.0"
script: ./ci/crossbeam-deque.sh
- rust: 1.28.0
name: "crossbeam-epoch on 1.28.0"
- rust: 1.26.0
name: "crossbeam-epoch on 1.26.0"
script: ./ci/crossbeam-epoch.sh
- rust: 1.28.0
name: "crossbeam-queue on 1.28.0"
- rust: 1.26.0
name: "crossbeam-queue on 1.26.0"
script: ./ci/crossbeam-queue.sh
- rust: 1.28.0
name: "crossbeam-skiplist on 1.28.0"
script: ./ci/crossbeam-skiplist.sh
- rust: 1.28.0
name: "crossbeam-utils on 1.28.0"
- rust: 1.26.0
name: "crossbeam-utils on 1.26.0"
script: ./ci/crossbeam-utils.sh

# Test crates on nightly Rust.
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-channel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ https://github.com/crossbeam-rs/crossbeam-channel)
https://crates.io/crates/crossbeam-channel)
[![Documentation](https://docs.rs/crossbeam-channel/badge.svg)](
https://docs.rs/crossbeam-channel)
[![Rust 1.28+](https://img.shields.io/badge/rust-1.28+-lightgray.svg)](
[![Rust 1.26+](https://img.shields.io/badge/rust-1.26+-lightgray.svg)](
https://www.rust-lang.org)
[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.gg/BBYwKq)

Expand Down
2 changes: 1 addition & 1 deletion crossbeam-epoch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ https://github.com/crossbeam-rs/crossbeam-epoch)
https://crates.io/crates/crossbeam-epoch)
[![Documentation](https://docs.rs/crossbeam-epoch/badge.svg)](
https://docs.rs/crossbeam-epoch)
[![Rust 1.28+](https://img.shields.io/badge/rust-1.28+-lightgray.svg)](
[![Rust 1.26+](https://img.shields.io/badge/rust-1.26+-lightgray.svg)](
https://www.rust-lang.org)
[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.gg/BBYwKq)

Expand Down
4 changes: 2 additions & 2 deletions crossbeam-queue/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ https://github.com/crossbeam-rs/crossbeam-queue/tree/master/src)
https://crates.io/crates/crossbeam-queue)
[![Documentation](https://docs.rs/crossbeam-queue/badge.svg)](
https://docs.rs/crossbeam-queue)
[![Rust 1.28+](https://img.shields.io/badge/rust-1.28+-lightgray.svg)](
[![Rust 1.26+](https://img.shields.io/badge/rust-1.26+-lightgray.svg)](
https://www.rust-lang.org)
[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.gg/BBYwKq)

Expand Down Expand Up @@ -37,7 +37,7 @@ extern crate crossbeam_queue;

## Compatibility

The minimum supported Rust version is 1.28.
The minimum supported Rust version is 1.26.

## License

Expand Down
2 changes: 1 addition & 1 deletion crossbeam-utils/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ https://github.com/crossbeam-rs/crossbeam-utils/tree/master/src)
https://crates.io/crates/crossbeam-utils)
[![Documentation](https://docs.rs/crossbeam-utils/badge.svg)](
https://docs.rs/crossbeam-utils)
[![Rust 1.28+](https://img.shields.io/badge/rust-1.28+-lightgray.svg)](
[![Rust 1.26+](https://img.shields.io/badge/rust-1.26+-lightgray.svg)](
https://www.rust-lang.org)
[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.gg/BBYwKq)

Expand Down
3 changes: 2 additions & 1 deletion crossbeam-utils/src/atomic/atomic_cell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ use Backoff;
/// [`AtomicCell::<T>::is_lock_free()`]: struct.AtomicCell.html#method.is_lock_free
/// [`Acquire`]: https://doc.rust-lang.org/std/sync/atomic/enum.Ordering.html#variant.Acquire
/// [`Release`]: https://doc.rust-lang.org/std/sync/atomic/enum.Ordering.html#variant.Release
#[repr(transparent)]
// TODO(@jeehoonkang): when the minimum supported Rust version is bumped to 1.28+, apply the
// attribute `#[repr(transparent)]`.
pub struct AtomicCell<T: ?Sized> {
/// The inner value.
///
Expand Down

0 comments on commit 7308fb3

Please sign in to comment.