From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 1 May 2021 12:20:57 +0000 (+0100)
Subject: global: Slightly reorganise InstanceOuter construction
X-Git-Tag: otter-0.6.0~494
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e24152739f7fc6b731c1e63e1dd240e3cee1370b;p=otter.git

global: Slightly reorganise InstanceOuter construction

Tidier, and makes space for bundles.

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

diff --git a/src/global.rs b/src/global.rs
index cc247f42..fc712955 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -335,14 +335,15 @@ impl Instance {
       links: default(),
     };
 
-    let cont = InstanceContainer {
+    let c = InstanceContainer {
       live: true,
       game_dirty: false,
       aux_dirty: false,
       g,
     };
 
-    let gref = InstanceRef(Arc::new(InstanceOuter { c: Mutex::new(cont) }));
+    let c = Mutex::new(c);
+    let gref = InstanceRef(Arc::new(InstanceOuter { c }));
     let mut ig = gref.lock()?;
 
     let entry = games.entry(name);
@@ -1121,13 +1122,14 @@ impl InstanceGuard<'_> {
       tokens_clients: default(),
       tokens_players: default(),
     };
-    let cont = InstanceContainer {
+    let c = InstanceContainer {
       live: true,
       game_dirty: false,
       aux_dirty: false,
       g,
     };
-    let gref = InstanceRef(Arc::new(InstanceOuter { c: Mutex::new(cont) }));
+    let c = Mutex::new(c);
+    let gref = InstanceRef(Arc::new(InstanceOuter { c }));
     let mut g = gref.lock().unwrap();
 
     let ig = &mut *g;