chiark / gitweb /
wip new accounts - fixes bad error message
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 31 Oct 2020 12:13:06 +0000 (12:13 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 31 Oct 2020 12:13:06 +0000 (12:13 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/global.rs

index 96004ea9f4e2438c32b5642a58bb12459f8de3dd..63abd4751fa0f1aaff3d2ff31c84f9d63783575f 100644 (file)
@@ -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)
 {