From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 31 Oct 2020 12:13:06 +0000 (+0000)
Subject: wip new accounts - fixes bad error message
X-Git-Tag: otter-0.2.0~578
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5f5f1e2dc83ea56f69508363c905c8a9caac3c13;p=otter.git

wip new accounts - fixes bad error message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/global.rs b/src/global.rs
index 96004ea9..63abd475 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -579,7 +579,7 @@ impl<'ig> InstanceGuard<'ig> {
   }
 
   #[throws(InternalError)]
-  pub fn invalidate_tokens(&'ig mut self, player: PlayerId) {
+  pub fn invalidate_tokens(&mut self, player: PlayerId) {
     let old_tokens = TokenRegistry {
       tr: self.tokens_players.tr.clone(),
       id: self.tokens_players.id,
@@ -1094,8 +1094,9 @@ pub fn record_token<Id : AccessId> (
 
 #[throws(E)]
 pub fn process_all_players_for_account<
+    'i, 'j : 'i,
     E: Error,
-    F: FnMut(&mut InstanceGuard, PlayerId) -> Result<(),E>
+    F: FnMut(&'i mut InstanceGuard<'j>, PlayerId) -> Result<(),E>
     >
   (acctid: AccountId, f: F)
 {