[[package]]
name = "slotmap"
-version = "0.4.0"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c46a3482db8f247956e464d783693ece164ca056e6e67563ee5505bdb86452cd"
+checksum = "ab3003725ae562cf995f3dc82bb99e70926e09000396816765bb6d7adbe740b1"
dependencies = [
"serde",
+ "version_check 0.9.2",
]
[[package]]
serde = { version = "1", features = ["derive","rc"] }
serde_json = "1"
serde_with = "1"
-slotmap = { version = "0.4", features = ['serde'] }
+slotmap = { version = "1", features = ['serde'] }
structopt = "0.3"
strum = { version = "0.20", features = ['derive'] }
thiserror = "1"
serde = { version = "1", features = ["derive","rc"] }
serde_json = "1"
serde_with = "1"
-slotmap = { version = "0.4", features = ['serde'] }
+slotmap = { version = "1", features = ['serde'] }
structopt = "0.3"
strum = { version = "0.20", features = ['derive'] }
thiserror = "1"
pub fn make_pieceid_visible(p: PieceId) -> VisiblePieceId {
// todo-lens need to do censorship mapping here
- let kd: slotmap::KeyData = p.into();
+ let kd: slotmap::KeyData = p.data();
VisiblePieceId(kd)
}
pub use serde::{Deserializer, Serializer};
pub use serde_with::DeserializeFromStr;
pub use serde_with::SerializeDisplay;
-pub use slotmap::dense::DenseSlotMap;
+pub use slotmap::{dense::DenseSlotMap, Key as _};
pub use strum::EnumString;
pub use thiserror::Error;
pub use url::Url;
fn try_from(s: String) -> $x { $x(slotkey_parse(&s,$sep)?) }
}
- impl slotmap::Key for $x { }
+ impl slotmap::Key for $x {
+ fn data(&self) -> slotmap::KeyData { self.0 }
+ }
impl From<slotmap::KeyData> for $x {
fn from(d : slotmap::KeyData) -> Self { $x(d) }
}
}
impl Lens for TransparentLens {
fn pieceid2visible(&self, piece: PieceId) -> VisiblePieceId {
- let kd : slotmap::KeyData = piece.into();
+ let kd : slotmap::KeyData = piece.data();
VisiblePieceId(kd)
}
fn log_pri(&self, piece: PieceId, pc: &PieceState)