From: Ian Jackson Date: Thu, 18 Jun 2020 00:16:25 +0000 (+0100) Subject: compiles again, but with dead code X-Git-Tag: otter-0.2.0~1576 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0dca0eb5ac762aa59cf5eb53e2237135fab4da5d;p=otter.git compiles again, but with dead code --- diff --git a/src/global.rs b/src/global.rs index 91ea10b1..60f6a263 100644 --- a/src/global.rs +++ b/src/global.rs @@ -59,12 +59,12 @@ pub fn xxx_global_setup() { clients : Default::default(), }; let i = Arc::new(Mutex::new(i)); - let ig = i.lock().unwrap(); + let mut ig = i.lock().unwrap(); for (token, nick) in XXX_USERS_TOKENS { - let nu = User { nick : nick.to_owned() }; + let nu = User { nick : nick.to_string() }; let user = ig.users.insert(nu); - let ia = InstanceAccess { i, user }; - GLOBAL.tokens().write().unwrap().insert( + let ia = InstanceAccess { i : i.clone(), user }; + GLOBAL.tokens.write().unwrap().insert( RawToken(token.to_string()), ia ); }