diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84845a1..7e1bc70 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: lint: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: style @@ -13,7 +13,7 @@ jobs: run: cargo clippy --all-targets --all-features -- -D warnings test: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 strategy: matrix: target: [ diff --git a/Cargo.toml b/Cargo.toml index 3519d4b..74a00e8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "dashmap" version = "5.4.0" authors = ["Acrimon "] edition = "2018" -rust-version = "1.59" +rust-version = "1.64" license = "MIT" repository = "https://github.com/xacrimon/dashmap" homepage = "https://github.com/xacrimon/dashmap" @@ -18,13 +18,13 @@ raw-api = [] inline = ["hashbrown/inline-more"] [dependencies] -lock_api = "0.4.8" -parking_lot_core = "0.9.3" -hashbrown = { version = "0.12.3", default-features = false } -serde = { version = "1.0.144", optional = true, features = ["derive"] } +lock_api = "0.4.10" +parking_lot_core = "0.9.8" +hashbrown = { version = "0.14.0", default-features = false } +serde = { version = "1.0.171", optional = true, features = ["derive"] } cfg-if = "1.0.0" -rayon = { version = "1.5.3", optional = true } -once_cell = "1.13.1" +rayon = { version = "1.7.0", optional = true } +once_cell = "1.18.0" [package.metadata.docs.rs] features = ["rayon", "raw-api", "serde"] diff --git a/README.md b/README.md index c06a5c0..1de225a 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ If you have any suggestions or tips do not hesitate to open an issue or a PR. [![downloads](https://img.shields.io/crates/d/dashmap)](https://crates.io/crates/dashmap) -[![minimum rustc version](https://img.shields.io/badge/rustc-1.59-orange.svg)](https://crates.io/crates/dashmap) +[![minimum rustc version](https://img.shields.io/badge/rustc-1.64-orange.svg)](https://crates.io/crates/dashmap) ## Cargo features diff --git a/rust-toolchain b/rust-toolchain index 62d03d5..3eca0d4 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,4 +1,4 @@ [toolchain] -channel = "1.59" -components = [ "rustfmt", "clippy" ] +channel = "stable-2022-09-22" +components = ["rustfmt", "clippy"] profile = "minimal" diff --git a/src/iter.rs b/src/iter.rs index cc2f12e..ce50e73 100644 --- a/src/iter.rs +++ b/src/iter.rs @@ -118,7 +118,7 @@ pub struct Iter<'a, K, V, S = RandomState, M = DashMap> { current: Option>, } -impl<'a, 'i, K: Clone + Hash + Eq, V: Clone, S: Clone + BuildHasher> Clone for Iter<'i, K, V, S> { +impl<'i, K: Clone + Hash + Eq, V: Clone, S: Clone + BuildHasher> Clone for Iter<'i, K, V, S> { fn clone(&self) -> Self { Iter::new(self.map) } diff --git a/src/lib.rs b/src/lib.rs index e552a96..9f96b96 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1263,7 +1263,7 @@ where } } -impl<'a, K: Eq + Hash, V, S: BuildHasher + Clone> IntoIterator for DashMap { +impl IntoIterator for DashMap { type Item = (K, V); type IntoIter = OwningIter; diff --git a/src/rayon/map.rs b/src/rayon/map.rs index 4fc0c43..ab45e61 100644 --- a/src/rayon/map.rs +++ b/src/rayon/map.rs @@ -173,7 +173,7 @@ where } } -impl<'a, K, V, S> DashMap +impl DashMap where K: Send + Sync + Eq + Hash, V: Send + Sync, diff --git a/src/set.rs b/src/set.rs index 12445a9..1a56177 100644 --- a/src/set.rs +++ b/src/set.rs @@ -385,7 +385,7 @@ impl<'a, K: 'a + Eq + Hash, S: BuildHasher + Clone> DashSet { } } -impl<'a, K: Eq + Hash, S: BuildHasher + Clone> IntoIterator for DashSet { +impl IntoIterator for DashSet { type Item = K; type IntoIter = OwningIter;