Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moka-cht v0.4.2 #4

Merged
merged 11 commits into from
Sep 5, 2021
Merged

moka-cht v0.4.2 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
435910a
Enable GitHub Actions
tatsuya6502 Jul 11, 2021
2ec5dfa
Fix GitHub Actions by removing unavailable Cargo feature
tatsuya6502 Jul 11, 2021
cfa4d87
Add Apache-2.0 license
tatsuya6502 Jul 12, 2021
4add7b5
Add the change log
tatsuya6502 Jul 12, 2021
14b5648
Reformat the change log
tatsuya6502 Jul 12, 2021
d3d4c81
Fix Clippy warnings
tatsuya6502 Sep 4, 2021
84ad38d
Temporary disable CI on the MSRV (1.41.1)
tatsuya6502 Sep 4, 2021
bb66ab1
Set the version to 0.4.2
tatsuya6502 Sep 4, 2021
16d4022
Update the changelog (v0.4.2)
tatsuya6502 Sep 4, 2021
536a49f
Merge branch 'main' into maint-0.4
tatsuya6502 Sep 5, 2021
23d518e
Change the version back to v0.5.0
tatsuya6502 Sep 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
rust:
- stable
- beta
- 1.41.1 # MSRV
# - 1.41.1 # MSRV

steps:
- name: Checkout moka-cht
Expand Down
12 changes: 9 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,22 @@

## Version 0.5.0

### Changed

- Updated the dependencies. ([#1][gh-pull-0001])
- (Internal change) Replaced deprecated `Atomic::compare_and_set_weak` of
crossbeam-epoch with `Atomic::compare_exchange_weak`. ([#1][gh-pull-0001])


## Version 0.4.2

- Forked from [cht-v0.4.1][cht-v041]. (The MIT License)
- Changed to a dual license of the MIT License and the Apache License (Version
2.0). ([#1][gh-pull-0001])

### Changed

- Updated the dependencies. ([#1][gh-pull-0001])
- Changed the default hasher from aHash to SipHash 1-3. ([#1][gh-pull-0001])
- (Internal change) Replaced deprecated `Atomic::compare_and_set_weak` of
crossbeam-epoch with `Atomic::compare_exchange_weak`. ([#1][gh-pull-0001])

### Removed

Expand Down
4 changes: 4 additions & 0 deletions src/map/bucket.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ impl<'g, K: 'g + Eq, V: 'g> BucketArray<K, V> {
}
}

// https://rust-lang.github.io/rust-clippy/master/index.html#type_complexity
#[allow(clippy::type_complexity)]
pub(crate) fn insert(
&self,
guard: &'g Guard,
Expand Down Expand Up @@ -176,6 +178,8 @@ impl<'g, K: 'g + Eq, V: 'g> BucketArray<K, V> {
}
}

// https://rust-lang.github.io/rust-clippy/master/index.html#type_complexity
#[allow(clippy::type_complexity)]
pub(crate) fn modify<F: FnMut(&K, &V) -> V>(
&self,
guard: &'g Guard,
Expand Down