Skip to content

Commit

Permalink
Merge pull request #171 from mahf-opt/remove-better_any-patch
Browse files Browse the repository at this point in the history
Remove better_any patch.
  • Loading branch information
luleyleo authored Jun 2, 2023
2 parents aed86e6 + 164444b commit c2a917b
Show file tree
Hide file tree
Showing 11 changed files with 10 additions and 13 deletions.
3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ itertools = "0.10.5"
better_any = { version = "0.2.0", features = ["derive"] }
scoped_threadpool = "0.1.9"

[patch.crates-io]
better_typeid_derive = { git = "https://github.com/luleyleo/better_any", branch = "no-use-tidable", package = "better_typeid_derive" }

[dev-dependencies]
proptest = "1.0.0"

Expand Down
2 changes: 1 addition & 1 deletion src/conditions/termination.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{
CustomState, State,
},
};
use better_any::Tid;
use better_any::{Tid, TidAble};
use serde::{Deserialize, Serialize};

#[derive(Serialize, Deserialize, Clone)]
Expand Down
2 changes: 1 addition & 1 deletion src/state/archive.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Archiving methods
use better_any::Tid;
use better_any::{Tid, TidAble};
use serde::{Deserialize, Serialize};

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion src/state/common.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Common state used in most heuristics.
use better_any::Tid;
use better_any::{Tid, TidAble};
use derive_more::{Deref, DerefMut};
use serde::Serialize;

Expand Down
2 changes: 1 addition & 1 deletion src/state/cro.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use better_any::Tid;
use better_any::{Tid, TidAble};
use rand::Rng;

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion src/state/diversity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
use std::marker::PhantomData;

use better_any::Tid;
use better_any::{Tid, TidAble};
use serde::Serialize;

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion src/state/pheromones.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use better_any::Tid;
use better_any::{Tid, TidAble};
use serde::Serialize;

use crate::state::CustomState;
Expand Down
2 changes: 1 addition & 1 deletion src/state/pso.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use better_any::Tid;
use better_any::{Tid, TidAble};
use rand::Rng;

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion src/state/random.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
use std::any::type_name;

use better_any::Tid;
use better_any::{Tid, TidAble};
use rand::{RngCore, SeedableRng};
use serde::Serialize;

Expand Down
2 changes: 1 addition & 1 deletion src/tracking/log.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::any::type_name;

use better_any::Tid;
use better_any::{Tid, TidAble};
use erased_serde::Serialize as DynSerialize;
use serde::Serialize;

Expand Down
2 changes: 1 addition & 1 deletion src/tracking/set.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use better_any::Tid;
use better_any::{Tid, TidAble};
use serde::Serialize;

use crate::{
Expand Down

0 comments on commit c2a917b

Please sign in to comment.