upgrade dependencies

.gitignore

@@ -1,2 +1,3 @@
 /target
 Cargo.lock
+.idea

Cargo.toml

@@ -9,10 +9,10 @@ repository = "https://github.com/b-inary/postflop-solver"
 license = "AGPL-3.0-or-later"
 
 [dependencies]
-bincode = { version = "2.0.0-rc.3", optional = true }
+bincode = { version = "2.0.1", optional = true }
 once_cell = "1.18.0"
-rayon = { version = "1.8.0", optional = true }
-regex = "1.9.6"
+rayon = { version = "1.11.0", optional = true }
+regex = "1.12.2"
 zstd = { version = "0.12.4", optional = true, default-features = false }
 
 [features]

src/action_tree.rs

@@ -390,10 +390,12 @@ impl ActionTree {
             let mut node = &*self.root.lock() as *const ActionTreeNode;
             for action in &self.history {
                 while (*node).is_chance() {
-                    node = &*(*node).children[0].lock();
+                    let node_ref = &*node;
+                    node = &*node_ref.children[0].lock();
                 }
                 let index = (*node).actions.iter().position(|x| x == action).unwrap();
-                node = &*(*node).children[index].lock();
+                let node_ref = &*node;
+                node = &*node_ref.children[index].lock();
             }
             &*node
         }
@@ -405,7 +407,8 @@ impl ActionTree {
         unsafe {
             let mut node = self.current_node() as *const ActionTreeNode;
             while (*node).is_chance() {
-                node = &*(*node).children[0].lock();
+                let node_ref = &*node;
+                node = &*node_ref.children[0].lock();
             }
             &*node
         }

src/file.rs

@@ -27,7 +27,7 @@ pub enum DataType {
 }
 
 /// A trait for data that can be saved into a file.
-pub trait FileData: Decode + Encode {
+pub trait FileData: Decode<()> + Encode  {
     #[doc(hidden)]
     fn data_type() -> DataType;
     #[doc(hidden)]
@@ -139,7 +139,7 @@ pub fn save_data_to_file<T: FileData, P: AsRef<Path>>(
     save_data_into_std_write(data, memo, &mut writer, compression_level)
 }
 
-fn decode_from_std_read<D: Decode, R: Read>(reader: &mut R, err_msg: &str) -> Result<D, String> {
+fn decode_from_std_read< D: Decode<()>, R: Read>(reader: &mut R, err_msg: &str) -> Result<D, String> {
     bincode::decode_from_std_read(reader, bincode::config::standard())
         .map_err(|e| format!("{}: {}", err_msg, e))
 }

src/game/serialization.rs

@@ -174,8 +174,8 @@ impl Encode for PostFlopGame {
     }
 }
 
-impl Decode for PostFlopGame {
-    fn decode<D: Decoder>(decoder: &mut D) -> Result<Self, DecodeError> {
+impl Decode<()> for PostFlopGame {
+    fn decode<D: Decoder<Context = ()>>(decoder: &mut D) -> Result<Self, DecodeError> {
         // version check
         let version = String::decode(decoder)?;
         if version != VERSION_STR {
@@ -292,7 +292,7 @@ impl Encode for PostFlopNode {
     }
 }
 
-impl Decode for PostFlopNode {
+impl Decode<()> for PostFlopNode {
     fn decode<D: Decoder>(decoder: &mut D) -> Result<Self, DecodeError> {
         // node instance
         let mut node = Self {

src/mutex_like.rs

@@ -99,17 +99,17 @@ impl<T: Encode> Encode for MutexLike<T> {
 }
 
 #[cfg(feature = "bincode")]
-impl<T: Decode> Decode for MutexLike<T> {
+impl<Context, T: Decode<Context>> Decode<Context> for MutexLike<T> where {
     #[inline]
-    fn decode<D: Decoder>(decoder: &mut D) -> Result<Self, DecodeError> {
+    fn decode<D: Decoder<Context = Context>>(decoder: &mut D) -> Result<Self, DecodeError> {
         Ok(Self::new(T::decode(decoder)?))
     }
 }
 
 #[cfg(feature = "bincode")]
-impl<'de, T: BorrowDecode<'de>> BorrowDecode<'de> for MutexLike<T> {
+impl<'de, Context, T: BorrowDecode<'de, Context>> BorrowDecode<'de, Context> for MutexLike<T> {
     #[inline]
-    fn borrow_decode<D: BorrowDecoder<'de>>(decoder: &mut D) -> Result<Self, DecodeError> {
+    fn borrow_decode<D: BorrowDecoder<'de, Context = Context>>(decoder: &mut D) -> Result<Self, DecodeError> {
         Ok(Self::new(T::borrow_decode(decoder)?))
     }
 }