mirror of https://github.com/xacrimon/dashmap
update deps & toolchain to stable-1.64 (#271)
This commit is contained in:
parent
7f9522c528
commit
d36311e634
|
@ -4,7 +4,7 @@ on: [push, pull_request]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lint:
|
lint:
|
||||||
runs-on: ubuntu-18.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- name: style
|
- name: style
|
||||||
|
@ -13,7 +13,7 @@ jobs:
|
||||||
run: cargo clippy --all-targets --all-features -- -D warnings
|
run: cargo clippy --all-targets --all-features -- -D warnings
|
||||||
|
|
||||||
test:
|
test:
|
||||||
runs-on: ubuntu-18.04
|
runs-on: ubuntu-22.04
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
target: [
|
target: [
|
||||||
|
|
14
Cargo.toml
14
Cargo.toml
|
@ -3,7 +3,7 @@ name = "dashmap"
|
||||||
version = "5.4.0"
|
version = "5.4.0"
|
||||||
authors = ["Acrimon <joel.wejdenstal@gmail.com>"]
|
authors = ["Acrimon <joel.wejdenstal@gmail.com>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
rust-version = "1.59"
|
rust-version = "1.64"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
repository = "https://github.com/xacrimon/dashmap"
|
repository = "https://github.com/xacrimon/dashmap"
|
||||||
homepage = "https://github.com/xacrimon/dashmap"
|
homepage = "https://github.com/xacrimon/dashmap"
|
||||||
|
@ -18,13 +18,13 @@ raw-api = []
|
||||||
inline = ["hashbrown/inline-more"]
|
inline = ["hashbrown/inline-more"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
lock_api = "0.4.8"
|
lock_api = "0.4.10"
|
||||||
parking_lot_core = "0.9.3"
|
parking_lot_core = "0.9.8"
|
||||||
hashbrown = { version = "0.12.3", default-features = false }
|
hashbrown = { version = "0.14.0", default-features = false }
|
||||||
serde = { version = "1.0.144", optional = true, features = ["derive"] }
|
serde = { version = "1.0.171", optional = true, features = ["derive"] }
|
||||||
cfg-if = "1.0.0"
|
cfg-if = "1.0.0"
|
||||||
rayon = { version = "1.5.3", optional = true }
|
rayon = { version = "1.7.0", optional = true }
|
||||||
once_cell = "1.13.1"
|
once_cell = "1.18.0"
|
||||||
|
|
||||||
[package.metadata.docs.rs]
|
[package.metadata.docs.rs]
|
||||||
features = ["rayon", "raw-api", "serde"]
|
features = ["rayon", "raw-api", "serde"]
|
||||||
|
|
|
@ -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)
|
[![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
|
## Cargo features
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
[toolchain]
|
[toolchain]
|
||||||
channel = "1.59"
|
channel = "stable-2022-09-22"
|
||||||
components = [ "rustfmt", "clippy" ]
|
components = ["rustfmt", "clippy"]
|
||||||
profile = "minimal"
|
profile = "minimal"
|
||||||
|
|
|
@ -118,7 +118,7 @@ pub struct Iter<'a, K, V, S = RandomState, M = DashMap<K, V, S>> {
|
||||||
current: Option<GuardIter<'a, K, V, S>>,
|
current: Option<GuardIter<'a, K, V, S>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
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 {
|
fn clone(&self) -> Self {
|
||||||
Iter::new(self.map)
|
Iter::new(self.map)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1263,7 +1263,7 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, K: Eq + Hash, V, S: BuildHasher + Clone> IntoIterator for DashMap<K, V, S> {
|
impl<K: Eq + Hash, V, S: BuildHasher + Clone> IntoIterator for DashMap<K, V, S> {
|
||||||
type Item = (K, V);
|
type Item = (K, V);
|
||||||
|
|
||||||
type IntoIter = OwningIter<K, V, S>;
|
type IntoIter = OwningIter<K, V, S>;
|
||||||
|
|
|
@ -173,7 +173,7 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, K, V, S> DashMap<K, V, S>
|
impl<K, V, S> DashMap<K, V, S>
|
||||||
where
|
where
|
||||||
K: Send + Sync + Eq + Hash,
|
K: Send + Sync + Eq + Hash,
|
||||||
V: Send + Sync,
|
V: Send + Sync,
|
||||||
|
|
|
@ -385,7 +385,7 @@ impl<'a, K: 'a + Eq + Hash, S: BuildHasher + Clone> DashSet<K, S> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, K: Eq + Hash, S: BuildHasher + Clone> IntoIterator for DashSet<K, S> {
|
impl<K: Eq + Hash, S: BuildHasher + Clone> IntoIterator for DashSet<K, S> {
|
||||||
type Item = K;
|
type Item = K;
|
||||||
|
|
||||||
type IntoIter = OwningIter<K, S>;
|
type IntoIter = OwningIter<K, S>;
|
||||||
|
|
Loading…
Reference in New Issue