Skip to content

Commit d36311e

Browse files
authored
update deps & toolchain to stable-1.64 (#271)
1 parent 7f9522c commit d36311e

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
jobs:
66
lint:
7-
runs-on: ubuntu-18.04
7+
runs-on: ubuntu-22.04
88
steps:
99
- uses: actions/checkout@v2
1010
- name: style
@@ -13,7 +13,7 @@ jobs:
1313
run: cargo clippy --all-targets --all-features -- -D warnings
1414

1515
test:
16-
runs-on: ubuntu-18.04
16+
runs-on: ubuntu-22.04
1717
strategy:
1818
matrix:
1919
target: [

Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "dashmap"
33
version = "5.4.0"
44
authors = ["Acrimon <[email protected]>"]
55
edition = "2018"
6-
rust-version = "1.59"
6+
rust-version = "1.64"
77
license = "MIT"
88
repository = "https://github.com/xacrimon/dashmap"
99
homepage = "https://github.com/xacrimon/dashmap"
@@ -18,13 +18,13 @@ raw-api = []
1818
inline = ["hashbrown/inline-more"]
1919

2020
[dependencies]
21-
lock_api = "0.4.8"
22-
parking_lot_core = "0.9.3"
23-
hashbrown = { version = "0.12.3", default-features = false }
24-
serde = { version = "1.0.144", optional = true, features = ["derive"] }
21+
lock_api = "0.4.10"
22+
parking_lot_core = "0.9.8"
23+
hashbrown = { version = "0.14.0", default-features = false }
24+
serde = { version = "1.0.171", optional = true, features = ["derive"] }
2525
cfg-if = "1.0.0"
26-
rayon = { version = "1.5.3", optional = true }
27-
once_cell = "1.13.1"
26+
rayon = { version = "1.7.0", optional = true }
27+
once_cell = "1.18.0"
2828

2929
[package.metadata.docs.rs]
3030
features = ["rayon", "raw-api", "serde"]

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you have any suggestions or tips do not hesitate to open an issue or a PR.
2020

2121
[![downloads](https://img.shields.io/crates/d/dashmap)](https://crates.io/crates/dashmap)
2222

23-
[![minimum rustc version](https://img.shields.io/badge/rustc-1.59-orange.svg)](https://crates.io/crates/dashmap)
23+
[![minimum rustc version](https://img.shields.io/badge/rustc-1.64-orange.svg)](https://crates.io/crates/dashmap)
2424

2525
## Cargo features
2626

rust-toolchain

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
2-
channel = "1.59"
3-
components = [ "rustfmt", "clippy" ]
2+
channel = "stable-2022-09-22"
3+
components = ["rustfmt", "clippy"]
44
profile = "minimal"

src/iter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ pub struct Iter<'a, K, V, S = RandomState, M = DashMap<K, V, S>> {
118118
current: Option<GuardIter<'a, K, V, S>>,
119119
}
120120

121-
impl<'a, 'i, K: Clone + Hash + Eq, V: Clone, S: Clone + BuildHasher> Clone for Iter<'i, K, V, S> {
121+
impl<'i, K: Clone + Hash + Eq, V: Clone, S: Clone + BuildHasher> Clone for Iter<'i, K, V, S> {
122122
fn clone(&self) -> Self {
123123
Iter::new(self.map)
124124
}

src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ where
12631263
}
12641264
}
12651265

1266-
impl<'a, K: Eq + Hash, V, S: BuildHasher + Clone> IntoIterator for DashMap<K, V, S> {
1266+
impl<K: Eq + Hash, V, S: BuildHasher + Clone> IntoIterator for DashMap<K, V, S> {
12671267
type Item = (K, V);
12681268

12691269
type IntoIter = OwningIter<K, V, S>;

src/rayon/map.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ where
173173
}
174174
}
175175

176-
impl<'a, K, V, S> DashMap<K, V, S>
176+
impl<K, V, S> DashMap<K, V, S>
177177
where
178178
K: Send + Sync + Eq + Hash,
179179
V: Send + Sync,

src/set.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ impl<'a, K: 'a + Eq + Hash, S: BuildHasher + Clone> DashSet<K, S> {
385385
}
386386
}
387387

388-
impl<'a, K: Eq + Hash, S: BuildHasher + Clone> IntoIterator for DashSet<K, S> {
388+
impl<K: Eq + Hash, S: BuildHasher + Clone> IntoIterator for DashSet<K, S> {
389389
type Item = K;
390390

391391
type IntoIter = OwningIter<K, S>;

0 commit comments

Comments
 (0)