funman300/Ferrous-Solitaire
1
1
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases 29 Wiki Activity

Remove card.rs #83

New Issue
Closed
opened 2026-06-11 03:09:31 +00:00 by Quaternions · 1 comment
Quaternions commented 2026-06-11 03:09:31 +00:00
Copy Link
Copy Source

This file is vestigial. card_to_id is frankenstein jank, all usages of the u32 output should be replaced with the upstream Card type.

This file is vestigial. card_to_id is frankenstein jank, all usages of the u32 output should be replaced with the upstream Card type.
funman300 commented 2026-06-12 02:35:16 +00:00
Owner
Copy Link
Copy Source

Resolved in commit e0a858d (branch refactor/strip-card_game-redundancies).

card_to_id (the 0..=51 frankenstein id) is removed and card.rs deleted. Replacements:

  • feedback_anim deal jitter: seeds off a hash of the Card itself, not a precomputed id.
  • radial_menu RightClickRadialState.cards: Vec<u32> -> Vec<Card>.
  • wasm CardSnapshot.id: u32 -> card_game::Card. Card is #[serde(transparent)] over NonZeroU8, so it still serialises as a plain JS number — the same opaque key the renderer already used (Map key / dataset.cardId; no arithmetic on it; faces render from rank+suit). A new test asserts card.id serialises as a JSON number.
  • wasm DebugInvariantReport deck-completeness check: reworked from a [bool;52] index into a HashSet<Card> + Card::new reference deck; the out-of-range check is dropped (a Card is always valid).

card.rs is gone: the Card/Deck/Rank/Suit re-exports moved to the crate root and the 69 solitaire_core::card:: import paths flattened to solitaire_core::.

cargo test --workspace (all crates green, incl. the wasm autonomous soak that exercises CardSnapshot + the invariant report) and clippy --workspace --all-targets -D warnings both pass.

Resolved in commit e0a858d (branch refactor/strip-card_game-redundancies). `card_to_id` (the 0..=51 frankenstein id) is removed and `card.rs` deleted. Replacements: - **feedback_anim** deal jitter: seeds off a hash of the `Card` itself, not a precomputed id. - **radial_menu** `RightClickRadialState.cards`: `Vec<u32>` -> `Vec<Card>`. - **wasm `CardSnapshot.id`**: `u32` -> `card_game::Card`. Card is `#[serde(transparent)]` over `NonZeroU8`, so it still serialises as a plain JS number — the same opaque key the renderer already used (Map key / `dataset.cardId`; no arithmetic on it; faces render from rank+suit). A new test asserts `card.id` serialises as a JSON number. - **wasm `DebugInvariantReport`** deck-completeness check: reworked from a `[bool;52]` index into a `HashSet<Card>` + `Card::new` reference deck; the out-of-range check is dropped (a `Card` is always valid). `card.rs` is gone: the `Card`/`Deck`/`Rank`/`Suit` re-exports moved to the crate root and the 69 `solitaire_core::card::` import paths flattened to `solitaire_core::`. `cargo test --workspace` (all crates green, incl. the wasm autonomous soak that exercises CardSnapshot + the invariant report) and `clippy --workspace --all-targets -D warnings` both pass.
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
android
bug
correctness
enhancement
performance
security
server
test
ui
ux
wasm
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
funman300 (Alex)
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: funman300/Ferrous-Solitaire#83
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?