From 3948d0565acc9ce2633dab9f61b9527ec15b0666 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 1 May 2022 12:14:12 +0100 Subject: [PATCH] rename GOccults from GameOccults Tried to refer to it as GOccults (without looking it up) and obviously that's what it ought to be. Signed-off-by: Ian Jackson --- src/clock.rs | 2 +- src/currency.rs | 4 ++-- src/deck.rs | 6 +++--- src/dice.rs | 2 +- src/fastsplit.rs | 2 +- src/gamestate.rs | 4 ++-- src/hand.rs | 2 +- src/hidden.rs | 34 +++++++++++++++++----------------- src/pcrender.rs | 4 ++-- src/pieces.rs | 2 +- src/shapelib.rs | 2 +- src/updates.rs | 4 ++-- src/vpid.rs | 4 ++-- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/clock.rs b/src/clock.rs index be445a53..0e11b946 100644 --- a/src/clock.rs +++ b/src/clock.rs @@ -535,7 +535,7 @@ impl PieceTrait for Clock { } #[throws(IE)] - fn describe_html(&self, _gpc: &GPiece, _goccults: &GameOccults) -> Html { + fn describe_html(&self, _gpc: &GPiece, _goccults: &GOccults) -> Html { Html::lit("the chess clock").into() } diff --git a/src/currency.rs b/src/currency.rs index 44c54dfe..408f1334 100644 --- a/src/currency.rs +++ b/src/currency.rs @@ -99,7 +99,7 @@ impl PieceBaseTrait for Banknote { #[typetag::serde(name="Currency")] impl PieceTrait for Banknote { #[throws(IE)] - fn describe_html(&self, gpc: &GPiece, _: &GameOccults) -> Html { + fn describe_html(&self, gpc: &GPiece, _: &GOccults) -> Html { let value: &Value = gpc.xdata.get_exp()?; hformat!("{}, {}{}", self.image.describe_html(gpc.face)?, @@ -130,7 +130,7 @@ impl PieceTrait for Banknote { move |ig: &mut InstanceGuard, (player, tpiece)| { ig.fastsplit_split(player, tpiece, show, new_z, - move |_: &IOccults, _: &GameOccults, gpl: &GPlayer, + move |_: &IOccults, _: &GOccults, gpl: &GPlayer, tgpc: &mut GPiece, tipc: &IPiece, ngpc: &mut GPiece| { diff --git a/src/deck.rs b/src/deck.rs index 15328ef5..ecdfcaef 100644 --- a/src/deck.rs +++ b/src/deck.rs @@ -77,7 +77,7 @@ impl PieceSpec for piece_specs::Deck { impl Deck { #[throws(IE)] - fn state(&self, gpc: &GPiece, goccults: &GameOccults) -> State { + fn state(&self, gpc: &GPiece, goccults: &GOccults) -> State { match gpc.occult.active_views(goccults)? { None => Disabled, Some(OccultationViews { defview: OccK::Visible,.. }) => Counting, @@ -88,7 +88,7 @@ impl Deck { } #[throws(IE)] - fn current_face(&self, gpc: &GPiece, goccults: &GameOccults) -> FaceId { + fn current_face(&self, gpc: &GPiece, goccults: &GOccults) -> FaceId { RawFaceId::into(match self.state(gpc, goccults)? { Disabled | Counting => 0, Enabled => 1, @@ -128,7 +128,7 @@ impl PieceTrait for Deck { } #[throws(IE)] - fn describe_html(&self, gpc: &GPiece, goccults: &GameOccults) -> Html { + fn describe_html(&self, gpc: &GPiece, goccults: &GOccults) -> Html { match self.state(gpc, goccults)? { Disabled => DISABLED_DESC, Counting => COUNTING_DESC, diff --git a/src/dice.rs b/src/dice.rs index b2597784..9807947a 100644 --- a/src/dice.rs +++ b/src/dice.rs @@ -328,7 +328,7 @@ impl PieceBaseTrait for Die { #[typetag::serde(name="Die")] impl PieceTrait for Die { #[throws(IE)] - fn describe_html(&self, gpc: &GPiece, _: &GameOccults) -> Html { + fn describe_html(&self, gpc: &GPiece, _: &GOccults) -> Html { let nfaces = self.nfaces(); let showing = { let label = &self.labels[gpc.face]; diff --git a/src/fastsplit.rs b/src/fastsplit.rs index b8930072..005cf69a 100644 --- a/src/fastsplit.rs +++ b/src/fastsplit.rs @@ -86,7 +86,7 @@ impl InstanceGuard<'_> { tpiece: PieceId, _: ShowUnocculted, tpc_new_z: ShouldSetZLevel, implementation: I ) -> UpdateFromOpComplex - where I: FnOnce(&IOccults, &GameOccults, &GPlayer, + where I: FnOnce(&IOccults, &GOccults, &GPlayer, &mut GPiece, &IPiece, &mut GPiece) -> Result diff --git a/src/gamestate.rs b/src/gamestate.rs index cdd9aed0..0599e994 100644 --- a/src/gamestate.rs +++ b/src/gamestate.rs @@ -49,7 +49,7 @@ pub struct GameState { // usual variable: gs pub log: VecDeque<(Generation, Arc)>, pub max_z: ZLevel, pub players: GPlayers, - pub occults: GameOccults, + pub occults: GOccults, } pub type GPlayers = DenseSlotMap; @@ -219,7 +219,7 @@ pub trait PieceTrait: PieceBaseTrait + Downcast + Send + Debug + 'static { fn svg_piece(&self, f: &mut Html, gpc: &GPiece, gs: &GameState, id: VisiblePieceId) -> Result<(),IE>; - fn describe_html(&self, gpc: &GPiece, _goccults: &GameOccults) + fn describe_html(&self, gpc: &GPiece, _goccults: &GOccults) -> Result; /// Piece is responsible for dealing with the possibility that they diff --git a/src/hand.rs b/src/hand.rs index 955e632e..c5b8bc7b 100644 --- a/src/hand.rs +++ b/src/hand.rs @@ -196,7 +196,7 @@ impl PieceTrait for Hand { } #[throws(IE)] - fn describe_html(&self, gpc: &GPiece, _goccults: &GameOccults) -> Html { + fn describe_html(&self, gpc: &GPiece, _goccults: &GOccults) -> Html { let xdata = gpc.xdata.get()?; self.behaviour.describe_html_inner(xdata) } diff --git a/src/hidden.rs b/src/hidden.rs index 02133949..283164f9 100644 --- a/src/hidden.rs +++ b/src/hidden.rs @@ -30,7 +30,7 @@ pub struct OcculterRotationChecked(()); pub struct IPieceTraitObj(Box); #[derive(Clone,Debug,Default,Serialize,Deserialize)] -pub struct GameOccults { +pub struct GOccults { occults: DenseSlotMap, } @@ -114,7 +114,7 @@ impl PieceOccult { pub fn is_active(&self) -> bool { self.active.is_some() } #[throws(IE)] - fn active_occ<'r>(&'r self, goccults: &'r GameOccults) + fn active_occ<'r>(&'r self, goccults: &'r GOccults) -> Option<&'r Occultation> { if let Some(occid) = self.active { let occ = goccults.occults.get(occid).ok_or_else( @@ -126,7 +126,7 @@ impl PieceOccult { } #[throws(IE)] - pub fn active_views<'r>(&'r self, goccults: &'r GameOccults) + pub fn active_views<'r>(&'r self, goccults: &'r GOccults) -> Option<&'r OccultationViews> { self.active_occ(goccults)?.map( |occ| &occ.views @@ -134,7 +134,7 @@ impl PieceOccult { } #[throws(IE)] - pub fn active_region<'r>(&'r self, goccults: &'r GameOccults) + pub fn active_region<'r>(&'r self, goccults: &'r GOccults) -> Option<&'r Region> { self.active_occ(goccults)?.map( |occ| &occ.region @@ -142,7 +142,7 @@ impl PieceOccult { } #[throws(IE)] - pub fn active_total_ppieces(&self, goccults: &GameOccults) + pub fn active_total_ppieces(&self, goccults: &GOccults) -> Option { self.active_occ(goccults)?.map(|occ| { let notches_len = usize::try_from(occ.notches.len()).unwrap(); @@ -151,7 +151,7 @@ impl PieceOccult { } pub fn passive_occid(&self) -> Option { Some(self.passive?.occid) } - pub fn passive_delete_hook(&self, goccults: &mut GameOccults, + pub fn passive_delete_hook(&self, goccults: &mut GOccults, piece: PieceId) { if_chain! { if let Some(Passive { occid, permute_notch }) = self.passive; @@ -257,7 +257,7 @@ impl Occultation { } } -impl GameOccults { +impl GOccults { #[throws(IE)] fn by_id(&self, occid: OccId) -> &Occultation { self.occults.get(occid).ok_or_else( @@ -272,7 +272,7 @@ impl GameOccults { } #[throws(IE)] - pub fn pos_occulter(&self, goccults: &GameOccults, pos: Pos) + pub fn pos_occulter(&self, goccults: &GOccults, pos: Pos) -> Option { goccults.occults.iter().find_map(|(_occid, occ)| { if occ.in_region(pos) { @@ -284,7 +284,7 @@ impl GameOccults { } pub fn is_empty(&self) -> bool { - let GameOccults { occults } = self; + let GOccults { occults } = self; occults.is_empty() } } @@ -294,7 +294,7 @@ impl GameOccults { /// None => do not render at all pub fn piece_pri( _ioccults: &IOccults, - occults: &GameOccults, + occults: &GOccults, player: PlayerId, gpl: &mut GPlayer, piece: PieceId, gpc: &GPiece, _ipc: &IPiece, ) -> Option @@ -462,7 +462,7 @@ impl GPiece { } - pub fn fully_visible_to(&self, goccults: &GameOccults, player: PlayerId) + pub fn fully_visible_to(&self, goccults: &GOccults, player: PlayerId) -> Option { const HIDE: Option = None; @@ -521,7 +521,7 @@ fn recalculate_occultation_general< gen: &mut UniqueGenGen, // gplayers: &GPlayers, gpieces: &mut GPieces, - goccults: &mut GameOccults, ipieces: &IPieces, ioccults: &IOccults, + goccults: &mut GOccults, ipieces: &IPieces, ioccults: &IOccults, // to_recalculate: &mut ToRecalculate, piece: PieceId, // if no change, we return ret_vanilla() @@ -707,7 +707,7 @@ fn recalculate_occultation_general< (||{ let occultation: - &mut dyn for<'g> FnMut(&'g mut GameOccults, OccId) -> &mut Occultation + &mut dyn for<'g> FnMut(&'g mut GOccults, OccId) -> &mut Occultation = &mut |goccults, occid| // rust-lang/rust/issues/58525 { @@ -805,7 +805,7 @@ fn recalculate_occultation_ofmany( gen: &mut UniqueGenGen, gplayers: &GPlayers, gpieces: &mut GPieces, - goccults: &mut GameOccults, + goccults: &mut GOccults, ipieces: &IPieces, ioccults: &IOccults, to_recalculate: &mut ToRecalculate, @@ -853,7 +853,7 @@ mod recompute { pub fn implement(self, gplayers: &mut GPlayers, gpieces: &mut GPieces, - goccults: &mut GameOccults, + goccults: &mut GOccults, ipieces: &IPieces) -> Implemented { let mut unprepared = vec![]; @@ -919,7 +919,7 @@ pub fn create_occultation( max_z: &mut ZLevel, gplayers: &mut GPlayers, gpieces: &mut GPieces, - goccults: &mut GameOccults, + goccults: &mut GOccults, ipieces: &IPieces, ioccults: &IOccults, to_recalculate: &mut ToRecalculate, @@ -1029,7 +1029,7 @@ pub fn remove_occultation( gen: &mut UniqueGenGen, gplayers: &mut GPlayers, gpieces: &mut GPieces, - goccults: &mut GameOccults, + goccults: &mut GOccults, ipieces: &IPieces, ioccults: &IOccults, to_recalculate: &mut ToRecalculate, diff --git a/src/pcrender.rs b/src/pcrender.rs index 02719dcd..44bcbb7b 100644 --- a/src/pcrender.rs +++ b/src/pcrender.rs @@ -66,7 +66,7 @@ impl PriOccultedGeneral { } } - pub fn describe(&self, ioccults: &IOccults, goccults: &GameOccults, + pub fn describe(&self, ioccults: &IOccults, goccults: &GOccults, gpc: &GPiece, ipc: &IPiece) -> Html { self.describe_fallible(ioccults, goccults, gpc, ipc) @@ -78,7 +78,7 @@ impl PriOccultedGeneral { #[throws(IE)] pub fn describe_fallible(&self, ioccults: &IOccults, - goccults: &GameOccults, + goccults: &GOccults, gpc: &GPiece, ipc: &IPiece) -> Html { match self.instead(ioccults, ipc)? { Left(y) => ipc.show(y).describe_html(gpc, goccults)?, diff --git a/src/pieces.rs b/src/pieces.rs index b0927596..0b83470c 100644 --- a/src/pieces.rs +++ b/src/pieces.rs @@ -134,7 +134,7 @@ impl PieceTrait for SimpleShape { self.svg_piece_raw(f, gpc.face, &mut |_|Ok(()))?; } #[throws(IE)] - fn describe_html(&self, gpc: &GPiece, _goccults: &GameOccults) -> Html { + fn describe_html(&self, gpc: &GPiece, _goccults: &GOccults) -> Html { let r = if_chain! { if let face = gpc.face; if let Some(colour) = self.colours.get(face); diff --git a/src/shapelib.rs b/src/shapelib.rs index 2ef4e32a..5a0c4711 100644 --- a/src/shapelib.rs +++ b/src/shapelib.rs @@ -389,7 +389,7 @@ impl PieceTrait for Item { self.svg_face(f, gpc.face, vpid, &gpc.xdata)?; } #[throws(IE)] - fn describe_html(&self, gpc: &GPiece, _goccults: &GameOccults) -> Html { + fn describe_html(&self, gpc: &GPiece, _goccults: &GOccults) -> Html { self.describe_face(gpc.face)? } diff --git a/src/updates.rs b/src/updates.rs index 817db00c..20d8cd94 100644 --- a/src/updates.rs +++ b/src/updates.rs @@ -316,7 +316,7 @@ struct FormattedLogEntry<'u> { // ---------- helpful utilities ---------- #[throws(Fatal)] -pub fn log_did_to_piece_whoby(ioccults: &IOccults, goccults: &GameOccults, +pub fn log_did_to_piece_whoby(ioccults: &IOccults, goccults: &GOccults, by_gpl: &GPlayer, gpc: &GPiece, ipc: &IPiece, did: &str) -> (Vec, Option) @@ -343,7 +343,7 @@ pub fn log_did_to_piece_whoby(ioccults: &IOccults, goccults: &GameOccults, } #[throws(Fatal)] -pub fn log_did_to_piece(ioccults: &IOccults, goccults: &GameOccults, +pub fn log_did_to_piece(ioccults: &IOccults, goccults: &GOccults, by_gpl: &GPlayer, gpc: &GPiece, ipc: &IPiece, did: &str) -> Vec { diff --git a/src/vpid.rs b/src/vpid.rs index a1785839..10ca8e32 100644 --- a/src/vpid.rs +++ b/src/vpid.rs @@ -372,14 +372,14 @@ pub fn permute(occid: OccId, pub fn consistency_check( _gplayers: &GPlayers, _gpieces: &GPieces, - _goccults: &GameOccults, + _goccults: &GOccults, ) { } #[cfg(debug_assertions)] pub fn consistency_check( gplayers: &GPlayers, gpieces: &GPieces, - goccults: &GameOccults, + goccults: &GOccults, ) { for (_player, gpl) in gplayers.iter() { for (piece, &vpid) in gpl.idmap.f.iter() { -- 2.30.2