fix Cargo.lock

This reverts commit 2eaa99e82d.

These functions are not necessary.  Remove their usages which are only used in tests and frankenstein code.

Cargo.lock

@@ -14,12 +14,6 @@ version = "0.7.6"
 source = "sparse+https://git.aleshym.co/api/packages/Quaternions/cargo/"
 checksum = "813440870d646c57c222c1d713dc4e3ddcb2919c3801564d767d85d7bf2afee4"
 
-[[package]]
-name = "autocfg"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
-
 [[package]]
 name = "bitflags"
 version = "2.11.1"
@@ -32,7 +26,6 @@ version = "0.4.0"
 dependencies = [
  "arrayvec",
  "serde",
- "serde_derive",
 ]
 
 [[package]]
@@ -139,7 +132,6 @@ dependencies = [
  "card_game",
  "rand",
  "serde",
- "serde_derive",
 ]
 
 [[package]]
@@ -158,9 +150,6 @@ dependencies = [
  "card_game",
  "klondike",
  "rand",
- "rmp-serde",
- "serde",
- "serde_json",
 ]
 
 [[package]]
@@ -187,15 +176,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "prettyplease"
 version = "0.2.37"
@@ -247,25 +227,6 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
-[[package]]
-name = "rmp"
-version = "0.8.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ba8be72d372b2c9b35542551678538b562e7cf86c3315773cae48dfbfe7790c"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "rmp-serde"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f81bee8c8ef9b577d1681a70ebbc962c232461e397b22c208c43c04b67a155"
-dependencies = [
- "rmp",
- "serde",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.28"
@@ -279,6 +240,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
  "serde_core",
+ "serde_derive",
 ]
 
 [[package]]

card_game/Cargo.toml

@@ -8,14 +8,12 @@ description = "Card game library."
 authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 keywords = ["card", "cards", "solitaire", "klondike"]
 
+[features]
+serde = ["dep:serde"]
+
 [dependencies]
 arrayvec = { version = "0.7.6", registry = "Quaternions", features = ["len_u8"], default-features = false }
-serde = { version = "1.0.228", default-features = false, optional = true }
+serde = { version = "1", optional = true, default-features = false, features = ["derive"] }
-serde_derive = { version = "1.0.228", default-features = false, optional = true }
 
 [lints]
 workspace = true
-
-[features]
-default = ["serde"]
-serde = ["dep:serde", "dep:serde_derive"]

card_game/src/lib.rs

@@ -28,6 +28,7 @@ pub trait Game: Clone {
 
 /// card_game supports up to 4 identifiably separate decks.
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Deck {
 	Deck1 = 0b00,
 	Deck2 = 0b01,
@@ -48,6 +49,7 @@ impl Deck {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Suit {
 	Spades = 0b00,
 	Hearts = 0b01,
@@ -77,6 +79,7 @@ impl Suit {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Rank {
 	Ace = 1,
 	Two = 2,
@@ -146,11 +149,8 @@ impl Rank {
 /// 2 bits for suit ID
 /// 4 bits for card Value
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-	feature = "serde",
+#[cfg_attr(feature = "serde", serde(transparent))]
-	derive(serde_derive::Deserialize, serde_derive::Serialize),
-	serde(transparent)
-)]
 pub struct Card(core::num::NonZeroU8);
 impl Card {
 	pub const fn new(deck: Deck, suit: Suit, rank: Rank) -> Self {
@@ -234,54 +234,9 @@ impl<const CAP: usize> IntoIterator for Stack<CAP> {
 		self.0.into_iter()
 	}
 }
-#[cfg(feature = "serde")]
-impl<'de, const CAP: usize> serde::Deserialize<'de> for Stack<CAP> {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where
-		D: serde::Deserializer<'de>,
-	{
-		struct StackVisitor<const CAP: usize>;
-		impl<'de, const CAP: usize> serde::de::Visitor<'de> for StackVisitor<CAP> {
-			type Value = Stack<CAP>;
-			fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-				write!(f, "Card Stack")
-			}
-			fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
-			where
-				A: serde::de::SeqAccess<'de>,
-			{
-				let mut stack = Stack::new();
-				while let Some(card) = seq.next_element()? {
-					// TODO: Error
-					stack.try_push(card).unwrap();
-				}
-				Ok(stack)
-			}
-		}
-		deserializer.deserialize_seq(StackVisitor)
-	}
-}
-#[cfg(feature = "serde")]
-impl<const CAP: usize> serde::Serialize for Stack<CAP> {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where
-		S: serde::Serializer,
-	{
-		use serde::ser::SerializeSeq;
-		let mut seq = serializer.serialize_seq(Some(self.len()))?;
-		for card in self.as_slice() {
-			seq.serialize_element(card)?;
-		}
-		seq.end()
-	}
-}
 
 /// A pile is a stack of face down cards and a stack of face up cards.
 #[derive(Clone, Debug, Default, Eq, Hash, PartialEq)]
-#[cfg_attr(
-	feature = "serde",
-	derive(serde_derive::Deserialize, serde_derive::Serialize)
-)]
 pub struct Pile<const DN: usize, const UP: usize> {
 	face_down: Stack<DN>,
 	face_up: Stack<UP>,
@@ -422,10 +377,6 @@ pub enum SessionInstruction<I> {
 }
 
 #[derive(Clone, Debug, Default)]
-#[cfg_attr(
-	feature = "serde",
-	derive(serde_derive::Deserialize, serde_derive::Serialize)
-)]
 pub struct SessionStats<S> {
 	inner: S,
 	undos: u32,
@@ -442,10 +393,6 @@ impl<S> SessionStats<S> {
 	}
 }
 #[derive(Clone, Debug)]
-#[cfg_attr(
-	feature = "serde",
-	derive(serde_derive::Deserialize, serde_derive::Serialize)
-)]
 pub struct SessionConfig<C> {
 	pub inner: C,
 	pub undo_penalty: i32,
@@ -475,10 +422,6 @@ pub struct Session<G: Game> {
 	state: SessionState<G>,
 }
 #[derive(Clone, Debug)]
-#[cfg_attr(
-	feature = "serde",
-	derive(serde_derive::Deserialize, serde_derive::Serialize)
-)]
 pub struct StateSnapshot<G: Game> {
 	state: G,
 	instruction: G::Instruction,
@@ -652,86 +595,3 @@ where
 		self.state.is_win()
 	}
 }
-
-#[cfg_attr(
-	feature = "serde",
-	derive(serde_derive::Deserialize),
-	serde(bound(deserialize = "
-		G: serde::Deserialize<'de>,
-		SessionConfig<G::Config>: serde::Deserialize<'de>,
-		Vec<G::Instruction>: serde::Deserialize<'de>,
-	"))
-)]
-struct SerializedSession<G: Game> {
-	config: SessionConfig<G::Config>,
-	state: G,
-	history: Vec<G::Instruction>,
-}
-#[cfg(feature = "serde")]
-impl<'de, G: Game<Score = i32>> serde::de::Deserialize<'de> for Session<G>
-where
-	G: serde::Deserialize<'de> + Clone + Eq + core::hash::Hash,
-	G::Stats: Default,
-	G::Instruction: serde::Deserialize<'de> + Eq + core::hash::Hash,
-	SessionConfig<G::Config>: serde::Deserialize<'de>,
-	Vec<G::Instruction>: serde::Deserialize<'de>,
-{
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where
-		D: serde::Deserializer<'de>,
-	{
-		let serialized = SerializedSession::deserialize(deserializer)?;
-		let mut session = Session::new(serialized.state, serialized.config);
-		for instruction in serialized.history {
-			session.process_instruction(instruction);
-		}
-		Ok(session)
-	}
-}
-#[cfg(feature = "serde")]
-impl<G: Game> serde::Serialize for Session<G>
-where
-	G: serde::Serialize,
-	G::Config: serde::Serialize,
-	G::Instruction: serde::Serialize,
-{
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where
-		S: serde::Serializer,
-	{
-		struct History<'a, G: Game>(&'a [StateSnapshot<G>]);
-		impl<G: Game> serde::Serialize for History<'_, G>
-		where
-			G: serde::Serialize,
-			G::Instruction: serde::Serialize,
-		{
-			fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-			where
-				S: serde::Serializer,
-			{
-				let &History(history) = self;
-				use serde::ser::SerializeSeq;
-				let mut seq = serializer.serialize_seq(Some(history.len()))?;
-				for snapshot in history {
-					seq.serialize_element(&snapshot.instruction)?;
-				}
-				seq.end()
-			}
-		}
-
-		use serde::ser::SerializeStruct;
-		let mut map = serializer.serialize_struct("Session", 3)?;
-		// serialize the initial state of the game.
-		// if there is history, it is the first snapshot's state,
-		// otherwise it is the current game state since there are no moves.
-		let state = if let Some(snapshot) = self.state.history.first() {
-			snapshot.state()
-		} else {
-			&self.state.state
-		};
-		map.serialize_field("config", &self.config)?;
-		map.serialize_field("state", state)?;
-		map.serialize_field("history", &History(&self.state.history))?;
-		map.end()
-	}
-}

klondike-cli/Cargo.toml

@@ -8,10 +8,5 @@ card_game.workspace = true
 klondike.workspace = true
 rand = { version = "0.10.1", default-features = false, features = ["thread_rng"] }
 
-[dev-dependencies]
-rmp-serde = "1.3.1"
-serde = { version = "1.0.228", default-features = false }
-serde_json = "1.0.149"
-
 [lints]
 workspace = true

klondike-cli/src/test.rs

@@ -14,35 +14,3 @@ fn test_is_winnable() {
 		println!("Game is not winnable");
 	}
 }
-
-#[test]
-fn test_json() {
-	let mut session = Session::new_default(Klondike::with_seed(124));
-	let solution_result = session.solve();
-	if let Ok(Some(solution)) = solution_result {
-		for snapshot in solution.clean_solution() {
-			session.process_instruction(snapshot.instruction().clone());
-		}
-	}
-	let serialized = serde_json::to_string(&session).unwrap();
-	println!("serialized = {serialized}");
-	let round_trip_session: Session<Klondike> = serde_json::from_str(&serialized).unwrap();
-	let serialized2 = serde_json::to_string(&round_trip_session).unwrap();
-	assert_eq!(serialized, serialized2);
-}
-
-#[test]
-fn test_rmp() {
-	let mut session = Session::new_default(Klondike::with_seed(124));
-	let solution_result = session.solve();
-	if let Ok(Some(solution)) = solution_result {
-		for snapshot in solution.clean_solution() {
-			session.process_instruction(snapshot.instruction().clone());
-		}
-	}
-	let serialized = rmp_serde::to_vec(&session).unwrap();
-	println!("serialized.len() = {}", serialized.len());
-	let round_trip_session: Session<Klondike> = rmp_serde::from_slice(&serialized).unwrap();
-	let serialized2 = rmp_serde::to_vec(&round_trip_session).unwrap();
-	assert_eq!(serialized, serialized2);
-}

klondike/Cargo.toml

@@ -3,15 +3,13 @@ name = "klondike"
 version = "0.3.0"
 edition = "2024"
 
+[features]
+serde = ["dep:serde"]
+
 [dependencies]
 card_game.workspace = true
 rand = { version = "0.10.1", default-features = false, features = ["std_rng"] }
-serde = { version = "1.0.228", default-features = false, optional = true }
+serde = { version = "1", optional = true, default-features = false, features = ["derive"] }
-serde_derive = { version = "1.0.228", default-features = false, optional = true }
 
 [lints]
 workspace = true
-
-[features]
-default = ["serde"]
-serde = ["dep:serde", "dep:serde_derive"]

klondike/src/lib.rs

@@ -7,10 +7,6 @@ use card_game::{Card, Game, Pile, Rank, Stack};
 #[cfg(doctest)]
 struct ReadmeDoctests;
 
-#[cfg_attr(
-	feature = "serde",
-	derive(serde_derive::Deserialize, serde_derive::Serialize)
-)]
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
 pub enum DrawStockConfig {
 	#[default]
@@ -18,10 +14,6 @@ pub enum DrawStockConfig {
 	DrawThree = 3,
 }
 
-#[cfg_attr(
-	feature = "serde",
-	derive(serde_derive::Deserialize, serde_derive::Serialize)
-)]
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
 pub enum MoveFromFoundationConfig {
 	#[default]
@@ -29,10 +21,6 @@ pub enum MoveFromFoundationConfig {
 	Disallowed,
 }
 
-#[cfg_attr(
-	feature = "serde",
-	derive(serde_derive::Deserialize, serde_derive::Serialize)
-)]
 #[derive(Clone, Copy, Debug)]
 pub struct ScoringConfig {
 	pub move_to_foundation: i32,
@@ -56,10 +44,6 @@ impl Default for ScoringConfig {
 	}
 }
 
-#[cfg_attr(
-	feature = "serde",
-	derive(serde_derive::Deserialize, serde_derive::Serialize)
-)]
 #[derive(Clone, Debug, Default)]
 pub struct KlondikeConfig {
 	pub draw_stock: DrawStockConfig,
@@ -137,6 +121,7 @@ impl KlondikeStats {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Tableau {
 	Tableau1,
 	Tableau2,
@@ -163,6 +148,7 @@ impl Tableau {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Foundation {
 	Foundation1,
 	Foundation2,
@@ -183,6 +169,7 @@ impl Foundation {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum KlondikePile {
 	Tableau(Tableau),
 	Stock,
@@ -216,6 +203,7 @@ impl From<Foundation> for KlondikePile {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum SkipCards {
 	Skip0,
 	Skip1,
@@ -254,6 +242,7 @@ impl SkipCards {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct TableauStack {
 	pub tableau: Tableau,
 	pub skip_cards: SkipCards,
@@ -287,6 +276,7 @@ impl TableauStack {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum KlondikePileStack {
 	Tableau(TableauStack),
 	Stock,
@@ -310,6 +300,7 @@ impl KlondikePileStack {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct DstFoundation {
 	pub src: KlondikePile,
 	pub foundation: Foundation,
@@ -333,6 +324,7 @@ impl DstFoundation {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct DstTableau {
 	pub src: KlondikePileStack,
 	pub tableau: Tableau,
@@ -356,6 +348,7 @@ impl DstTableau {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum KlondikeInstruction {
 	DstFoundation(DstFoundation),
 	DstTableau(DstTableau),
@@ -395,10 +388,6 @@ const fn sum(n: usize) -> usize {
 const STOCK: usize = 52 - sum(TABLEAUS);
 const NUM_RANKS: usize = Rank::RANKS.len();
 
-#[cfg_attr(
-	feature = "serde",
-	derive(serde_derive::Deserialize, serde_derive::Serialize)
-)]
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub struct KlondikeState {
 	stock: Pile<STOCK, STOCK>,
@@ -633,11 +622,6 @@ fn test_klondike_iter() {
 	assert_eq!(KlondikeIter::new().count(), 721);
 }
 
-#[cfg_attr(
-	feature = "serde",
-	derive(serde_derive::Deserialize, serde_derive::Serialize),
-	serde(transparent)
-)]
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub struct Klondike {
 	state: KlondikeState,
@@ -822,28 +806,3 @@ impl Game for Klondike {
 		})
 	}
 }
-
-#[cfg(feature = "serde")]
-impl serde::Serialize for KlondikeInstruction {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where
-		S: serde::Serializer,
-	{
-		// There is 721 klondike instructions
-		let instruction_id = KlondikeIter::new()
-			.position(|instruction| &instruction == self)
-			.unwrap();
-		serializer.serialize_u16(instruction_id as u16)
-	}
-}
-#[cfg(feature = "serde")]
-impl<'de> serde::Deserialize<'de> for KlondikeInstruction {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where
-		D: serde::Deserializer<'de>,
-	{
-		let instruction_id = u16::deserialize(deserializer)?;
-		let instruction = KlondikeIter::new().nth(instruction_id as usize).unwrap();
-		Ok(instruction)
-	}
-}