- Bump version to 5.0.3

awolverp · awolverp · commit db4aef5881f0 · 2025-10-10T10:29:27.000+03:30
- Better support for Python 3.14 - Use `immutable_type` feature for Python 3.14 - Some improvements - Thanks to [@chirizxc](https://github.com/chirizxc) - Bump rust dependencies - Use Rust nightly - Use `parking_lot::Mutex` instead of duplicating its code !test
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -38,6 +38,8 @@ jobs:
           args: --release --out dist --find-interpreter
           sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
           manylinux: auto
+          rust-toolchain: nightly
+        
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
@@ -71,6 +73,8 @@ jobs:
           args: --release --out dist --find-interpreter
           sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
           manylinux: musllinux_1_2
+          rust-toolchain: nightly
+        
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
@@ -100,6 +104,8 @@ jobs:
           target: ${{ matrix.platform.target }}
           args: --release --out dist --find-interpreter
           sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
+          rust-toolchain: nightly
+        
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
@@ -128,6 +134,8 @@ jobs:
           target: ${{ matrix.platform.target }}
           args: --release --out dist --find-interpreter
           sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
+          rust-toolchain: nightly
+
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
@@ -143,6 +151,8 @@ jobs:
         with:
           command: sdist
           args: --out dist
+          rust-toolchain: nightly
+
       - name: Upload sdist
         uses: actions/upload-artifact@v4
         with:
@@ -175,3 +185,4 @@ jobs:
         with:
           command: upload
           args: --non-interactive --skip-existing wheels-*/*
+          rust-toolchain: nightly
diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
@@ -33,6 +33,8 @@ jobs:
 
       - name: install rust stable
         uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: nightly
 
       - name: set up python
         uses: actions/setup-python@v5
@@ -68,6 +70,8 @@ jobs:
 
       - name: install rust stable
         uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: nightly
 
       - name: set up python
         uses: actions/setup-python@v5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v5.0.3 - 2025-10-10
+### Changed
+- Better support for Python 3.14
+- Use `immutable_type` feature for Python 3.14
+- Some improvements
+
+### Thanks
+- thanks to [@chirizxc](https://github.com/chirizxc)
+
+### Internal
+- Bump rust dependencies
+- Use Rust nightly
+- Use `parking_lot::Mutex` instead of duplicating its code
+
 ## v5.0.2 - 2025-09-14
 ### Changed
 - Support Python 3.14 ( for linux )
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cachebox"
-version = "5.0.2"
+version = "5.0.3"
 edition = "2021"
 description = "The fastest memoizing and caching Python library written in Rust"
 readme = "README.md"
@@ -38,11 +38,7 @@ features = ["macros", "extension-module"]
 version = "1.0.3"
 
 [dependencies.parking_lot]
-version = "0.12.4"
-
-[dependencies.lock_api]
-version = "0.4.13"
-default-features = false
+version = "0.12.5"
 
 [build-dependencies.pyo3-build-config]
 version = "0.26.0"
diff --git a/src/bridge/cache.rs b/src/bridge/cache.rs
@@ -2,7 +2,7 @@ use crate::common::Entry;
 use crate::common::ObservedIterator;
 use crate::common::PreHashObject;
 
-#[pyo3::pyclass(module = "cachebox._core", frozen)]
+#[pyo3::pyclass(module = "cachebox._core", frozen, immutable_type)]
 pub struct Cache {
     raw: crate::common::Mutex<crate::policies::nopolicy::NoPolicy>,
 }
diff --git a/src/bridge/fifocache.rs b/src/bridge/fifocache.rs
@@ -2,7 +2,7 @@ use crate::common::Entry;
 use crate::common::ObservedIterator;
 use crate::common::PreHashObject;
 
-#[pyo3::pyclass(module = "cachebox._core", frozen)]
+#[pyo3::pyclass(module = "cachebox._core", frozen, immutable_type)]
 pub struct FIFOCache {
     raw: crate::common::Mutex<crate::policies::fifo::FIFOPolicy>,
 }
diff --git a/src/bridge/lfucache.rs b/src/bridge/lfucache.rs
@@ -2,7 +2,7 @@ use crate::common::Entry;
 use crate::common::ObservedIterator;
 use crate::common::PreHashObject;
 
-#[pyo3::pyclass(module = "cachebox._core", frozen)]
+#[pyo3::pyclass(module = "cachebox._core", frozen, immutable_type)]
 pub struct LFUCache {
     raw: crate::common::Mutex<crate::policies::lfu::LFUPolicy>,
 }
diff --git a/src/bridge/lrucache.rs b/src/bridge/lrucache.rs
@@ -2,7 +2,7 @@ use crate::common::Entry;
 use crate::common::ObservedIterator;
 use crate::common::PreHashObject;
 
-#[pyo3::pyclass(module = "cachebox._core", frozen)]
+#[pyo3::pyclass(module = "cachebox._core", frozen, immutable_type)]
 pub struct LRUCache {
     raw: crate::common::Mutex<crate::policies::lru::LRUPolicy>,
 }
diff --git a/src/bridge/mod.rs b/src/bridge/mod.rs
@@ -3,7 +3,7 @@ use pyo3::types::PyTypeMethods;
 
 create_exception!(cachebox._core, CoreKeyError, pyo3::exceptions::PyException);
 
-#[pyo3::pyclass(module = "cachebox._cachebox", subclass, frozen)]
+#[pyo3::pyclass(module = "cachebox._cachebox", subclass, frozen, immutable_type)]
 pub struct BaseCacheImpl {}
 
 #[pyo3::pymethods]
@@ -38,7 +38,7 @@ impl BaseCacheImpl {
     }
 }
 
-#[pyo3::pyclass(module = "cachebox._core", frozen)]
+#[pyo3::pyclass(module = "cachebox._core", frozen, immutable_type)]
 pub struct TTLPair {
     key: pyo3::Py<pyo3::PyAny>,
     value: pyo3::Py<pyo3::PyAny>,
diff --git a/src/bridge/rrcache.rs b/src/bridge/rrcache.rs
@@ -3,7 +3,7 @@ use crate::common::Entry;
 use crate::common::ObservedIterator;
 use crate::common::PreHashObject;
 
-#[pyo3::pyclass(module = "cachebox._core", frozen)]
+#[pyo3::pyclass(module = "cachebox._core", frozen, immutable_type)]
 pub struct RRCache {
     raw: crate::common::Mutex<crate::policies::random::RandomPolicy>,
 }
diff --git a/src/bridge/ttlcache.rs b/src/bridge/ttlcache.rs
@@ -3,13 +3,13 @@ use crate::common::ObservedIterator;
 use crate::common::PreHashObject;
 use crate::common::TimeToLivePair;
 
-#[pyo3::pyclass(module = "cachebox._core", frozen)]
+#[pyo3::pyclass(module = "cachebox._core", frozen, immutable_type)]
 pub struct TTLCache {
     raw: crate::common::Mutex<crate::policies::ttl::TTLPolicy>,
 }
 
 #[allow(non_camel_case_types)]
-#[pyo3::pyclass(module = "cachebox._core")]
+#[pyo3::pyclass(module = "cachebox._core", immutable_type)]
 pub struct ttlcache_items {
     pub ptr: ObservedIterator,
     pub iter: crate::common::Mutex<crate::policies::ttl::TTLIterator>,
diff --git a/src/bridge/vttlcache.rs b/src/bridge/vttlcache.rs
@@ -3,7 +3,7 @@ use crate::common::ObservedIterator;
 use crate::common::PreHashObject;
 use crate::common::TimeToLivePair;
 
-#[pyo3::pyclass(module = "cachebox._core", frozen)]
+#[pyo3::pyclass(module = "cachebox._core", frozen, immutable_type)]
 pub struct VTTLCache {
     raw: crate::common::Mutex<crate::policies::vttl::VTTLPolicy>,
 }
diff --git a/src/common.rs b/src/common.rs
@@ -350,6 +350,7 @@ impl Observed {
 }
 
 #[inline]
+#[optimize(speed)]
 unsafe fn _get_state(py: pyo3::Python<'_>, ptr: *mut pyo3::ffi::PyObject) -> pyo3::PyResult<u16> {
     unsafe fn inner(
         py: pyo3::Python<'_>,
@@ -485,6 +486,4 @@ impl TimeToLivePair {
     }
 }
 
-// Thanks to `Amanieu d'Antras` for this beautiful implementation.
-// https://github.com/Amanieu/parking_lot/blob/eeb186c48c8e6433c10f7552ef1cd1d56e5c83b1/src/raw_mutex.rs
-pub type Mutex<T> = lock_api::Mutex<parking_lot::RawMutex, T>;
+pub type Mutex<T> = parking_lot::Mutex<T>;
diff --git a/src/lazyheap.rs b/src/lazyheap.rs
@@ -98,11 +98,13 @@ impl<T> LazyHeap<T> {
         Some(*node)
     }
 
+    #[inline]
     pub fn pop_back(&mut self, compare: impl Fn(&T, &T) -> std::cmp::Ordering) -> Option<T> {
         self.sort_by(compare);
         self.unlink_back()
     }
 
+    #[inline]
     pub fn get(&self, index: usize) -> Option<&NonNull<T>> {
         self.data.get(index)
     }
@@ -127,15 +129,18 @@ impl<T> LazyHeap<T> {
         *boxed_node
     }
 
+    #[inline]
     pub fn clear(&mut self) {
         while self.unlink_back().is_some() {}
         self.is_sorted = true;
     }
 
+    #[inline]
     pub fn shrink_to_fit(&mut self) {
         self.data.shrink_to_fit();
     }
 
+    #[inline]
     pub fn iter(&mut self, compare: impl Fn(&T, &T) -> std::cmp::Ordering) -> Iter<T> {
         self.sort_by(compare);
 
diff --git a/src/lib.rs b/src/lib.rs
diff --git a/src/linked_list.rs b/src/linked_list.rs
diff --git a/src/policies/fifo.rs b/src/policies/fifo.rs

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ use crate::common::Entry;`
`2`	`2`	`use crate::common::ObservedIterator;`
`3`	`3`	`use crate::common::PreHashObject;`
`4`	`4`
`5`		`-#[pyo3::pyclass(module = "cachebox._core", frozen)]`
	`5`	`+#[pyo3::pyclass(module = "cachebox._core", frozen, immutable_type)]`
`6`	`6`	`pub struct Cache {`
`7`	`7`	`raw: crate::common::Mutex<crate::policies::nopolicy::NoPolicy>,`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ use pyo3::types::PyTypeMethods;`
`3`	`3`
`4`	`4`	`create_exception!(cachebox._core, CoreKeyError, pyo3::exceptions::PyException);`
`5`	`5`
`6`		`-#[pyo3::pyclass(module = "cachebox._cachebox", subclass, frozen)]`
	`6`	`+#[pyo3::pyclass(module = "cachebox._cachebox", subclass, frozen, immutable_type)]`
`7`	`7`	`pub struct BaseCacheImpl {}`
`8`	`8`
`9`	`9`	`#[pyo3::pymethods]`
`@@ -38,7 +38,7 @@ impl BaseCacheImpl {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`-#[pyo3::pyclass(module = "cachebox._core", frozen)]`
	`41`	`+#[pyo3::pyclass(module = "cachebox._core", frozen, immutable_type)]`
`42`	`42`	`pub struct TTLPair {`
`43`	`43`	`key: pyo3::Py<pyo3::PyAny>,`
`44`	`44`	`value: pyo3::Py<pyo3::PyAny>,`