Skip to content

Commit

Permalink
update deps & toolchain to stable-1.64 (#271)
Browse files Browse the repository at this point in the history
  • Loading branch information
xacrimon committed Jul 11, 2023
1 parent 7f9522c commit d36311e
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: [
Expand Down
14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "dashmap"
version = "5.4.0"
authors = ["Acrimon <[email protected]>"]
edition = "2018"
rust-version = "1.59"
rust-version = "1.64"
license = "MIT"
repository = "https://github.com/xacrimon/dashmap"
homepage = "https://github.com/xacrimon/dashmap"
Expand All @@ -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"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.59"
components = [ "rustfmt", "clippy" ]
channel = "stable-2022-09-22"
components = ["rustfmt", "clippy"]
profile = "minimal"
2 changes: 1 addition & 1 deletion src/iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ pub struct Iter<'a, K, V, S = RandomState, M = DashMap<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 {
Iter::new(self.map)
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 IntoIter = OwningIter<K, V, S>;
Expand Down
2 changes: 1 addition & 1 deletion src/rayon/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ where
}
}

impl<'a, K, V, S> DashMap<K, V, S>
impl<K, V, S> DashMap<K, V, S>
where
K: Send + Sync + Eq + Hash,
V: Send + Sync,
Expand Down
2 changes: 1 addition & 1 deletion src/set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 IntoIter = OwningIter<K, S>;
Expand Down

0 comments on commit d36311e

Please sign in to comment.