Skip to content

Commit

Permalink
Merge #235
Browse files Browse the repository at this point in the history
235: MSRV 1.60 r=matklad a=matklad



Co-authored-by: Alex Kladov <aleksey.kladov@gmail.com>
  • Loading branch information
bors[bot] and matklad committed Jun 4, 2023
2 parents b2c0116 + 8a69b8f commit 61f8384
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Expand Up @@ -2,7 +2,8 @@

## Unreleased

-
- `MSRV` is updated to 1.60.0 to take advantage of `dep:` features,
removing "implementation details" Cargo features.

## 1.17.2

Expand Down
14 changes: 6 additions & 8 deletions Cargo.toml
Expand Up @@ -4,7 +4,7 @@ version = "1.17.2"
authors = ["Aleksey Kladov <aleksey.kladov@gmail.com>"]
license = "MIT OR Apache-2.0"
edition = "2021"
rust-version = "1.56"
rust-version = "1.60"

description = "Single assignment cells and lazy values."
readme = "README.md"
Expand All @@ -20,17 +20,15 @@ exclude = ["*.png", "*.svg", "/Cargo.lock.msrv", "rustfmt.toml"]
members = ["xtask"]

[dependencies]
# These optional dependencies are considered private impl details,
# only features from `[features]` table are a part of semver-guarded API.
parking_lot_core = { version = "0.9.3", optional = true, default_features = false }
atomic_polyfill = { package = "atomic-polyfill", version = "1", optional = true }
critical_section = { package = "critical-section", version = "1", optional = true }
atomic-polyfill = { version = "1", optional = true }
critical-section = { version = "1", optional = true }

[dev-dependencies]
lazy_static = "1.0.0"
crossbeam-utils = "0.8.7"
regex = "1.2.0"
critical_section = { package = "critical-section", version = "1.1.1", features = ["std"] }
critical-section = { version = "1.1.1", features = ["std"] }

[features]
default = ["std"]
Expand All @@ -47,12 +45,12 @@ race = []
# Uses parking_lot to implement once_cell::sync::OnceCell.
# This makes no speed difference, but makes each OnceCell<T>
# up to 16 bytes smaller, depending on the size of the T.
parking_lot = ["parking_lot_core"]
parking_lot = ["dep:parking_lot_core"]

# Uses `critical-section` to implement `sync` and `race` modules. in
# `#![no_std]` mode. Please read `critical-section` docs carefully
# before enabling this feature.
critical-section = ["critical_section", "atomic_polyfill" ]
critical-section = ["dep:critical-section", "dep:atomic-polyfill" ]

# Enables semver-exempt APIs of this crate.
# At the moment, this feature is unused.
Expand Down
2 changes: 1 addition & 1 deletion xtask/src/main.rs
Expand Up @@ -5,7 +5,7 @@ use std::time::Instant;

use xshell::{cmd, Shell};

const MSRV: &str = "1.56.0";
const MSRV: &str = "1.60.0";

fn main() -> xshell::Result<()> {
let sh = Shell::new()?;
Expand Down

0 comments on commit 61f8384

Please sign in to comment.