chore(deps): update dependencies

Author: ChieloNewctle

Cargo.toml

@@ -14,10 +14,6 @@ name = "general_sam"
 crate-type = ["cdylib"]
 
 [dependencies]
-general-sam = { version = "0.6.1", features = ["all"] }
-pyo3 = { version = "0.20.0", features = [
-  "extension-module",
-  "abi3-py38",
-  "generate-import-lib",
-] }
-either = "1.9.0"
+either = "1.10.0"
+general-sam = { version = "0.7.0", features = ["all"] }
+pyo3 = { version = "0.20.3", features = ["extension-module", "generate-import-lib", "abi3-py38"] }

src/sam.rs

@@ -243,21 +243,18 @@ impl GeneralSAM {
         GeneralSAMState(for_both_with_side!(
             self.0.as_ref(),
             side,
-            x => side(RustBoxBisectGeneralSAMState {
-                sam: x.clone(),
-                node_id: SAM_ROOT_NODE_ID,
-            })
+            x => side(RustBoxBisectGeneralSAMState::new(
+                x.clone(),
+                SAM_ROOT_NODE_ID,
+            )),
         ))
     }
 
     pub fn get_state(&self, node_id: usize) -> GeneralSAMState {
         GeneralSAMState(for_both_with_side!(
             self.0.as_ref(),
             side,
-            x => side(RustBoxBisectGeneralSAMState {
-                sam: x.clone(),
-                node_id,
-            })
+            x => side(RustBoxBisectGeneralSAMState::new(x.clone(), node_id)),
         ))
     }
 

src/utils.rs

@@ -53,6 +53,9 @@ macro_rules! for_both_with_side {
             }
         }
     };
+    ($value:expr, $side:ident, $pattern:pat => $result:expr,) => {
+        for_both_with_side!($value, $side, $pattern => $result)
+    }
 }
 
 pub use for_both_with_side;