chiark / gitweb /
~ianmdlvl / otter.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e487797)
hidden: Get rid of now-unused parameters to log_did*
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 16 Mar 2021 15:56:37 +0000 (15:56 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 16 Mar 2021 16:04:20 +0000 (16:04 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
daemon/api.rs patch | blob | history
src/updates.rs patch | blob | history

diff --git a/daemon/api.rs b/daemon/api.rs
index 0bb08b9ce38c540bd799bd02b9f3524115c260c3..2d1304466738ecf5e247affb152d8a93e740e5b3 100644 (file)
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -248,7 +248,7 @@ api_route!{
     let gpc = gs.pieces.byid_mut(piece)?;
 
     let logents = log_did_to_piece(
-      ioccults, &gs.occults, player, gpl, piece, gpc, ipc,
+      ioccults,gpl,gpc,ipc,
       "grasped"
     )?;
 
@@ -320,7 +320,7 @@ api_route!{
     let gpc = gs.pieces.byid_mut(piece).unwrap();
 
     let (logents, who_by) = log_did_to_piece_whoby(
-      ioccults, &gs.occults, player, gpl, piece, gpc, ipc,
+      ioccults,gpl,gpc,ipc,
       "released"
     )?;
     let who_by = who_by.ok_or(OE::PieceGone)?;
@@ -423,7 +423,7 @@ api_route!{
     let gpc = gs.pieces.byid_mut(piece).unwrap();
     let gpl = gs.players.byid_mut(player).unwrap();
     let logents = log_did_to_piece(
-      ioccults, &gs.occults, player, gpl, piece, gpc, ipc,
+      ioccults,gpl,gpc,ipc,
       "rotated"
     )?;
     gpc.angle = PieceAngle::Compass(self.0);
@@ -444,7 +444,7 @@ api_route!{
     let gpc = gs.pieces.byid_mut(piece).unwrap();
     let gpl = gs.players.byid_mut(player).unwrap();
     let logents = log_did_to_piece(
-      ioccults, &gs.occults, player, gpl, piece, gpc, ipc,
+      ioccults,gpl,gpc,ipc,
       if gpc.pinned { "pinned" } else { "unpinned" },
     )?;
     gpc.forbid_involved_in_occultation()?;
@@ -491,7 +491,7 @@ api_route!{
           ("flip", wrc@ WRC::UpdateSvg) => {
             let nfaces = ipc.show(y).nfaces();
             let logents = log_did_to_piece(
-              ioccults, &gs.occults, player, gpl, piece, gpc, ipc,
+              ioccults,gpl,gpc,ipc,
               "flipped"
             )?;
             gpc.face = ((RawFaceId::from(gpc.face) + 1) % nfaces).into();
diff --git a/src/updates.rs b/src/updates.rs
index 4cd380ab952b78961d60120afbf1d9be3be26ea0..a62530fc58401677d153f3a40795e9aa1ca5be53 100644 (file)
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -202,10 +202,7 @@ struct FormattedLogEntry<'u> {
 #[throws(OE)]
 pub fn log_did_to_piece_whoby(
   ioccults: &IOccults,
-  _occults: &GameOccults,
-  _player: PlayerId,
   by_gpl: &mut GPlayer,
-  _piece: PieceId,
   gpc: &GPiece, ipc: &IPiece,
   did: &str,
 ) -> (Vec<LogEntry>, Option<Html>) {
@@ -233,13 +230,11 @@ pub fn log_did_to_piece_whoby(
 #[throws(OE)]
 pub fn log_did_to_piece(
   ioccults: &IOccults,
-  occults: &GameOccults,
-  player: PlayerId,
-  by_gpl: &mut GPlayer,
-  piece: PieceId, gpc: &GPiece, ipc: &IPiece,
+  gpl_by: &mut GPlayer,
+  gpc: &GPiece, ipc: &IPiece,
   did: &str,
 ) -> Vec<LogEntry> {
-  log_did_to_piece_whoby(ioccults,occults,player,by_gpl,piece,gpc,ipc,did)?.0
+  log_did_to_piece_whoby(ioccults,gpl_by,gpc,ipc,did)?.0
 }
 
 // ---------- prepared updates, queued in memory ----------
Unnamed repository; edit this file 'description' to name the repository.