Skip to content

Commit a116575

Browse files
committed
Require Rust 1.26 and bump minor versions
1 parent 047ea91 commit a116575

File tree

7 files changed

+9
-15
lines changed

7 files changed

+9
-15
lines changed

.travis.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,13 @@ matrix:
99
fast_finish: true
1010
include:
1111
# NB: To help with CI delays, each `pull_request` is only tested on Linux,
12-
# with 1.13 for compatibility and stable+rayon_unstable for broad test
12+
# with 1.26 for compatibility and stable+rayon_unstable for broad test
1313
# coverage. The bors bot counts as a `push` type, which will run it all.
1414

15-
- rust: 1.13.0
15+
- rust: 1.26.0
1616
os: linux
1717
#if: everything!
1818
script: cargo build
19-
before_script:
20-
# lazy_static 1.1 requires Rust 1.21+, so downgrade it.
21-
# (and docopt 1.1 requires lazy_static 1.3)
22-
- cargo generate-lockfile
23-
- cargo update -p docopt --precise 1.0.2
24-
- cargo update -p lazy_static --precise 1.0.2
2519

2620
- rust: stable
2721
os: linux

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rayon"
33
# Reminder to update html_rool_url in lib.rs when updating version
4-
version = "1.0.3"
4+
version = "1.1.0"
55
authors = ["Niko Matsakis <[email protected]>",
66
"Josh Stone <[email protected]>"]
77
description = "Simple work-stealing parallelism for Rust"
@@ -19,7 +19,7 @@ members = ["rayon-demo", "rayon-core", "rayon-futures"]
1919
exclude = ["ci"]
2020

2121
[dependencies]
22-
rayon-core = { version = "1.4.1", path = "rayon-core" }
22+
rayon-core = { version = "1.5.0", path = "rayon-core" }
2323
crossbeam-deque = "0.2.0"
2424

2525
# This is a public dependency!

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ just add:
9090
use rayon::prelude::*;
9191
```
9292

93-
Rayon currently requires `rustc 1.13.0` or greater.
93+
Rayon currently requires `rustc 1.26.0` or greater.
9494

9595
## Contribution
9696

rayon-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rayon-core"
3-
version = "1.4.1" # reminder to update html_root_url attribute
3+
version = "1.5.0" # reminder to update html_root_url attribute
44
authors = ["Niko Matsakis <[email protected]>",
55
"Josh Stone <[email protected]>"]
66
description = "Core APIs for Rayon"

rayon-core/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ Please see [Rayon Docs] for details about using Rayon.
88

99
[Rayon Docs]: https://docs.rs/rayon/
1010

11-
Rayon-core currently requires `rustc 1.13.0` or greater.
11+
Rayon-core currently requires `rustc 1.26.0` or greater.

rayon-core/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
//! conflicting requirements will need to be resolved before the build will
2020
//! succeed.
2121
22-
#![doc(html_root_url = "https://docs.rs/rayon-core/1.4")]
22+
#![doc(html_root_url = "https://docs.rs/rayon-core/1.5")]
2323
#![deny(missing_debug_implementations)]
2424
#![deny(missing_docs)]
2525

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![doc(html_root_url = "https://docs.rs/rayon/1.0")]
1+
#![doc(html_root_url = "https://docs.rs/rayon/1.1")]
22
#![deny(missing_debug_implementations)]
33
#![deny(missing_docs)]
44

0 commit comments

Comments
 (0)