Skip to content

Commit

Permalink
Merge #948
Browse files Browse the repository at this point in the history
948: Switch build_scoped to `std::thread::scope` (Rust 1.63) r=cuviper a=cuviper



Co-authored-by: Josh Stone <cuviper@gmail.com>
  • Loading branch information
bors[bot] and cuviper authored Aug 22, 2023
2 parents 63b959c + 69c8dbf commit 01fdee1
Show file tree
Hide file tree
Showing 11 changed files with 283 additions and 208 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ on:
jobs:

check:
name: Check (1.59.0)
name: Check (1.63.0)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@1.59.0
- uses: dtolnay/rust-toolchain@1.63.0
- run: cp ci/compat-Cargo.lock ./Cargo.lock
- run: cargo check --verbose --locked

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,11 +8,11 @@ env:
jobs:

check:
name: Check (1.59.0)
name: Check (1.63.0)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@1.59.0
- uses: dtolnay/rust-toolchain@1.63.0
- run: cp ci/compat-Cargo.lock ./Cargo.lock
- run: cargo check --verbose --locked

Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "rayon"
version = "1.7.0"
version = "1.8.0"
authors = ["Niko Matsakis <niko@alum.mit.edu>",
"Josh Stone <cuviper@gmail.com>"]
description = "Simple work-stealing parallelism for Rust"
rust-version = "1.59"
rust-version = "1.63"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "/~https://github.com/rayon-rs/rayon"
Expand All @@ -19,7 +19,7 @@ members = ["rayon-demo", "rayon-core"]
exclude = ["ci"]

[dependencies]
rayon-core = { version = "1.11.0", path = "rayon-core" }
rayon-core = { version = "1.12.0", path = "rayon-core" }

# 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.59](https://img.shields.io/badge/rustc-1.59+-red.svg)
![minimum rustc 1.63](https://img.shields.io/badge/rustc-1.63+-red.svg)
[![build status](/~https://github.com/rayon-rs/rayon/workflows/master/badge.svg)](/~https://github.com/rayon-rs/rayon/actions)
[![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.59.0` or greater.
Rayon currently requires `rustc 1.63.0` or greater.

### Usage with WebAssembly

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.59.0)",
"Check (1.63.0)",
"Test (ubuntu-latest, stable)",
"Test (ubuntu-latest, stable-i686)",
"Test (ubuntu-latest, beta)",
Expand Down
Loading

0 comments on commit 01fdee1

Please sign in to comment.