Skip to content

Commit

Permalink
Merge pull request #275 from moka-rs/msrv-1.65
Browse files Browse the repository at this point in the history
Bump the minimum supported Rust version (MSRV) to 1.65 (Nov 3, 2022)
  • Loading branch information
tatsuya6502 authored Jun 3, 2023
2 parents 2ec7e97 + b17f54d commit e5690f8
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 20 deletions.
7 changes: 4 additions & 3 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ linux_arm64_task:
cpu: $NUM_CPUS
matrix:
- image: rust:slim # docker's official latest rust stable version
- image: rustlang/rust:nightly-slim # nightly hosted by rustlang
- image: rust:1.60.0-slim # MSRV
## Disable jobs for nightly and the MSRV to avoid to hit the concurrency limit.
# - image: rustlang/rust:nightly-slim # nightly hosted by rustlang
# - image: rust:1.65.0-slim # MSRV
# no rust-beta image found in docker hub, won't be tested

## Disable caching as there is no Cargo.lock file in Moka repository.
Expand Down Expand Up @@ -51,7 +52,7 @@ linux_arm64_task:
# Pin some dependencies to specific versions (MSRV only)
# pin_deps_script: |
# if [ "v$RUST_VERSION" == "v1.60.0" ]; then
# if [ "v$RUST_VERSION" == "v1.65.0" ]; then
# echo 'Pinning some dependencies to specific versions'
# cargo update -p <crate> --precise <version>
# else
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
rust:
- stable
- beta
- 1.60.0 # MSRV
- 1.65.0 # MSRV
- nightly # For checking minimum version dependencies.

steps:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
cargo update -p cc --precise 1.0.61
# - name: Pin some dependencies to specific versions (MSRV only)
# if: ${{ matrix.rust == '1.60.0' }}
# if: ${{ matrix.rust == '1.65.0' }}
# run: |
# cargo update -p <crate> --precise <version>

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/CIQuantaDisabled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
rust:
- stable
- beta
- 1.60.0 # MSRV
- 1.65.0 # MSRV
- nightly # For checking minimum version dependencies.

steps:
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
cargo update -p cc --precise 1.0.61
# - name: Pin some dependencies to specific versions (MSRV only)
# if: ${{ matrix.rust == '1.60.0' }}
# if: ${{ matrix.rust == '1.65.0' }}
# run: |
# cargo update -p <crate> --precise <version>

Expand Down
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Moka Cache &mdash; Change Log

## Version 0.11.2

Bumped the minimum supported Rust version (MSRV) to 1.65 (Nov 3, 2022).
([#275][gh-issue-0275])


## Version 0.11.1

### Fixed
Expand Down Expand Up @@ -37,7 +43,7 @@

## Version 0.10.2

Bumped the minimum supported Rust version (MSRV) to 1.60 (2022-04-07).
Bumped the minimum supported Rust version (MSRV) to 1.60 (Apr 7, 2022).
([#252][gh-issue-0252])

### Changed
Expand Down Expand Up @@ -386,7 +392,7 @@ be frequently changed in next few releases.

## Version 0.7.2

The minimum supported Rust version (MSRV) is now 1.51.0 (2021-03-25).
The minimum supported Rust version (MSRV) is now 1.51.0 (Mar 25, 2021).

### Fixed

Expand Down Expand Up @@ -660,6 +666,7 @@ The minimum supported Rust version (MSRV) is now 1.51.0 (2021-03-25).
[gh-issue-0034]: https://github.com/moka-rs/moka/issues/34/
[gh-issue-0031]: https://github.com/moka-rs/moka/issues/31/

[gh-pull-0275]: https://github.com/moka-rs/moka/pull/275/
[gh-pull-0272]: https://github.com/moka-rs/moka/pull/272/
[gh-pull-0268]: https://github.com/moka-rs/moka/pull/268/
[gh-pull-0259]: https://github.com/moka-rs/moka/pull/259/
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "moka"
version = "0.11.1"
version = "0.11.2"
edition = "2018"
rust-version = "1.60" # Released on April 7, 2022, supporting 2021 edition.

# Rust 1.65 was released on November 3rd, 2022, is supporting 2021 edition.
rust-version = "1.65"
description = "A fast and concurrent cache library inspired by Java Caffeine"
license = "MIT OR Apache-2.0"
# homepage = "https://"
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -437,10 +437,10 @@ section ([`sync::Cache`][doc-sync-cache-expiration],

Moka's minimum supported Rust versions (MSRV) are the followings:

| Feature | MSRV |
|:-----------------|:------------------------:|
| default features | Rust 1.60.0 (2022-04-07) |
| `future` | Rust 1.60.0 (2022-04-07) |
| Feature | MSRV |
|:-----------------|:-------------------------:|
| default features | Rust 1.65.0 (Nov 3, 2022) |
| `future` | Rust 1.65.0 (Nov 3, 2022) |

It will keep a rolling MSRV policy of at least 6 months. If only the default features
are enabled, MSRV will be updated conservatively. When using other features, like
Expand Down
8 changes: 4 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@
//!
//! This crate's minimum supported Rust versions (MSRV) are the followings:
//!
//! | Feature | MSRV |
//! |:-----------------|:------------------------:|
//! | default features | Rust 1.60.0 (2022-04-07) |
//! | `future` | Rust 1.60.0 (2022-04-07) |
//! | Feature | MSRV |
//! |:-----------------|:-------------------------:|
//! | default features | Rust 1.65.0 (Nov 3, 2022) |
//! | `future` | Rust 1.65.0 (Nov 3, 2022) |
//!
//! It will keep a rolling MSRV policy of at least 6 months. If only the default
//! features are enabled, MSRV will be updated conservatively. When using other
Expand Down

0 comments on commit e5690f8

Please sign in to comment.