Merge branch 'hotfix/0.13.1'

Cargo.toml

@@ -7,24 +7,23 @@ categories = ["algorithms"]
 repository = "https://github.com/lucidfrontier45/localsearch"
 license-file = "LICENSE"
 readme = "README.md"
-version = "0.13.0"
+version = "0.13.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 rand = "0.8.5"
-ordered-float = "4.1.1"
-rayon = "1.8.0"
-trait-set = "0.3.0"
-auto_impl = "1.1.0"
+ordered-float = "4.2.2"
+rayon = "1.10.0"
+auto_impl = "1.2.0"
 
 [target.'cfg(target_family = "wasm")'.dependencies]
 web-time = "1.1.0"
 
 [dev-dependencies]
 approx = "0.5.1"
-indicatif = "0.17.7"
+indicatif = "0.17.8"
 
 [lib]
 name = "localsearch"

src/callback.rs

@@ -2,8 +2,6 @@
 
 use std::{cell::RefCell, rc::Rc};
 
-use trait_set::trait_set;
-
 /// OptProgress expresses Optimization Progress that is passed to a [`OptCallbackFn`]
 #[derive(Debug, Clone)]
 pub struct OptProgress<S, SC> {
@@ -29,7 +27,6 @@ impl<S, SC: Ord> OptProgress<S, SC> {
     }
 }
 
-trait_set! {
 /// OptCallbackFn is a trait of a callback function for optimization
 /// Typical usage is to show progress bar and save current result to the file
 ///
@@ -58,5 +55,6 @@ trait_set! {
 ///     pb.set_position(op.iter as u64);
 /// };
 /// ```
-pub trait OptCallbackFn<S, SC: PartialOrd> = Fn(OptProgress<S, SC>);
-}
+pub trait OptCallbackFn<S, SC: PartialOrd>: Fn(OptProgress<S, SC>) {}
+
+impl<F, S, SC: PartialOrd> OptCallbackFn<S, SC> for F where F: Fn(OptProgress<S, SC>) {}

src/optim/base.rs

@@ -1,5 +1,4 @@
 use auto_impl::auto_impl;
-use trait_set::trait_set;
 
 use crate::{callback::OptCallbackFn, Duration, OptModel};
 
@@ -57,7 +56,7 @@ pub trait LocalSearchOptimizer<M: OptModel> {
     }
 }
 
-trait_set! {
-    /// Transition probability function
-    pub trait TransitionProbabilityFn<ST: Ord + Sync + Send + Copy> = Fn(ST, ST) -> f64;
-}
+/// Transition probability function
+pub trait TransitionProbabilityFn<ST: Ord + Sync + Send + Copy>: Fn(ST, ST) -> f64 {}
+
+impl<F, ST: Ord + Sync + Send + Copy> TransitionProbabilityFn<ST> for F where F: Fn(ST, ST) -> f64 {}