Skip to content

Commit

Permalink
Merge #807
Browse files Browse the repository at this point in the history
807: Update crossbeam dependencies (requires Rust 1.36) r=cuviper a=mbrubeck

Update to the latest versions of:

* crossbeam-channel (0.5.0)
* crossbeam-deque (0.8.0)
* crossbeam-utils (0.8.0)

This increases the minimum Rust toolchain requirement from 1.31 to 1.36.

Co-authored-by: Matt Brubeck <mbrubeck@limpet.net>
  • Loading branch information
bors[bot] and mbrubeck authored Oct 14, 2020
2 parents 5b3d917 + 9691328 commit 1f069d7
Show file tree
Hide file tree
Showing 8 changed files with 123 additions and 113 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ on:
jobs:

check:
name: Check (1.31.0)
name: Check (1.36.0)
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install
uses: actions-rs/toolchain@v1
with:
toolchain: 1.31.0
toolchain: 1.36.0
profile: minimal
override: true
- name: Prepare Cargo.lock
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ env:
jobs:

check:
name: Check (1.31.0)
name: Check (1.36.0)
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install
uses: actions-rs/toolchain@v1
with:
toolchain: 1.31.0
toolchain: 1.36.0
profile: minimal
override: true
- name: Prepare Cargo.lock
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ exclude = ["ci"]

[dependencies]
rayon-core = { version = "1.8.1", path = "rayon-core" }
crossbeam-deque = "0.7.2"
crossbeam-deque = "0.8.0"

# This is a public dependency!
[dependencies.either]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Rayon crate](https://img.shields.io/crates/v/rayon.svg)](https://crates.io/crates/rayon)
[![Rayon documentation](https://docs.rs/rayon/badge.svg)](https://docs.rs/rayon)
![minimum rustc 1.31](https://img.shields.io/badge/rustc-1.31+-red.svg)
![minimum rustc 1.36](https://img.shields.io/badge/rustc-1.36+-red.svg)
![build status](https://github.com/rayon-rs/rayon/workflows/master/badge.svg)
[![Join the chat at https://gitter.im/rayon-rs/Lobby](https://badges.gitter.im/rayon-rs/Lobby.svg)](https://gitter.im/rayon-rs/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

Expand Down Expand Up @@ -84,7 +84,7 @@ just add:
use rayon::prelude::*;
```

Rayon currently requires `rustc 1.31.0` or greater.
Rayon currently requires `rustc 1.36.0` or greater.

## Contribution

Expand Down
2 changes: 1 addition & 1 deletion bors.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
status = [
"Check (1.31.0)",
"Check (1.36.0)",
"Test (ubuntu-latest, stable)",
"Test (ubuntu-latest, stable-i686)",
"Test (ubuntu-latest, beta)",
Expand Down
Loading

0 comments on commit 1f069d7

Please sign in to comment.