Skip to content

Commit

Permalink
Merge branch 'master' into invalidate-entries-if
Browse files Browse the repository at this point in the history
  • Loading branch information
tatsuya6502 committed Apr 24, 2021
2 parents 3e3300c + c8cb4ca commit 2a64385
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 11 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ jobs:
rust:
- stable
- beta
- 1.45.2 # MSRV
- 1.46.0 # MSRV (future)
- 1.45.2 # MSRV (no features)

steps:
- name: Checkout Moka
Expand Down Expand Up @@ -50,6 +51,7 @@ jobs:

- name: Run tests (future)
uses: actions-rs/cargo@v1
if: ${{ matrix.rust != '1.45.2' }}
with:
command: test
args: --release --features future
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ async-io = { version = "1", optional = true }
[dev-dependencies]
actix-rt2 = { package = "actix-rt", version = "2", default-features = false }
actix-rt1 = { package = "actix-rt", version = "1", default-features = false }
async-std = { version = "1", features = ["attributes"] }
async-std = { version = "1", default-features = false, features = ["attributes"] }
futures = "0.3"
getrandom = "0.2"
skeptic = "0.13"
Expand Down
20 changes: 13 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -310,21 +310,27 @@ available on crates.io, such as the [aHash][ahash-crate] crate.
[ahash-crate]: https://crates.io/crates/ahash


## Minimum Supported Rust Version
## Minimum Supported Rust Versions

This crate's minimum supported Rust version (MSRV) is 1.45.2.
This crate's minimum supported Rust versions (MSRV) are the followings:

<!--
- quanta requires 1.45.
- aHash 0.5 requires 1.43.
- cht requires 1.41.
-->
| Enabled Feature | MSRV |
|:---------------------|:------------|
| no feature (default) | Rust 1.45.2 |
| `future` | Rust 1.46.0 |

If no feature is enabled, MSRV will be updated conservatively. When using other
features, like `future`, MSRV might be updated more frequently, up to the latest
stable. In both cases, increasing MSRV is _not_ considered a semver-breaking
change.

<!--
- socket2 0.4.0 requires 1.46.
- quanta requires 1.45.
- aHash 0.5 requires 1.43.
- cht requires 1.41.
-->


## Road Map

Expand Down
9 changes: 7 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,14 @@
//! [sync-seg-cache-struct]: ./sync/struct.SegmentedCache.html
//! [unsync-cache-struct]: ./unsync/struct.Cache.html
//!
//! # Minimum Supported Rust Version
//! # Minimum Supported Rust Versions
//!
//! This crate's minimum supported Rust version (MSRV) is 1.45.2.
//! This crate's minimum supported Rust versions (MSRV) are the followings:
//!
//! | Enabled Feature | MSRV |
//! |:---------------------|:------------|
//! | no feature (default) | Rust 1.45.2 |
//! | `future` | Rust 1.46.0 |
//!
//! If no crate feature is enabled, MSRV will be updated conservatively. When using
//! features like `future`, MSRV might be updated more frequently, up to the latest
Expand Down

0 comments on commit 2a64385

Please sign in to comment.