Apply changes in the maint-0.5 branch #35
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It is currently failing because bitflags v1.3.1 is incompatible with the MSRV. This issue will be addressed by another pull request. (cherry picked from commit aa583ad)
(cherry picked from commit c1d6fbd)
The CI for the MSRV (1.46.0) is currently failing because parking_lot_core v0.8.4 is incompatible. It seems it requires Rust 1.49.0 or newer. This CI issue might be addressed later by another pull request.
- Remove the multiply operation (`max_capacity * 32`) when setting the
capacity of the popularity estimator (`FrequencySketch`).
- The implementation of the estimator was replaced in an older version
of Moka and the multiply operation was not really needed since then.
- Add code to ensure that the capacity of the popularity estimator always
fits within a range of `128u32..=u32::MAX`.
- Change the type of the internal fields of the estimator from `usize` to
`u32` so that the estimator will work consistency on any platform with
different pointer width.
- Reduce the max size of the popularity estimator on platforms with 32-bit addressing. - Change the type of the internal table of the estimator from `Vec<u64>` to `Box<[u64]>`.
- Add unit test to ensure overflows not to happen and the sizes of the population estimators are correct.
- Not a bug but for clarity, avoid a lossy cast from `u64` to `u32` before applying the table mask.
Handle `usize` overflow on big cache capacity
- Add the doc comments. - Add reqwest crate to the dev-dependency because an example uses it.
Update the code examples in the doc comments.
Add examples to the doc for `get_or_insert_with` and `get_or_try_insert_with` methods
…insert_with` - Add `Send` and `'static` bounds to the init futures. - Add UI tests to ensure compile failures to occur for misuses of `get_or_(try_)insert_with`.
…insert_with` Change the UI tests to run only when future feature is enabled.
Add `Send` and `'static` bounds to the init futures of `get_or_(try_)insert_with`
Downgrade crossbeam-epoch by downgrading moka-cht from v0.5.0 to v0.4.2.
moka-cht v0.4.2 has been published to crates.io.
Downgrade crossbeam-epoch from v0.9.x to v0.8.x
Conflicts:
CHANGELOG.md
Cargo.toml
src/future/cache.rs
src/sync/cache.rs
…_with They were removed by an error when resolving merge conflicts.
Add UI tests for `get_or_try_insert_with`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Apply recent changes in the maint-0.5 branch to the master branch. These changes include pull requests #28, #30, #32 #33 and #36.