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 cc247f42917f3603fa38ef2c32a7a87e0c415909..fc7129554bafb72d11e9b64de43847b994c15f17 100644 (file)
--- 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;