From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 1 Aug 2020 16:13:05 +0000 (+0100)
Subject: use save_directory
X-Git-Tag: otter-0.2.0~1200
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6541293eb6927d8164e8e408e77519534458e2e8;p=otter.git

use save_directory
---

diff --git a/src/global.rs b/src/global.rs
index 607e2a56..78b915ed 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -521,11 +521,11 @@ impl InstanceGuard<'_> {
       Server => format!(""),
       Unix{user} => { format!("{}:", user) },
     } };
-    iter::once(prefix)
-      .chain( iter::once(scope_prefix.as_ref()) )
+    [ SAVE_DIRECTORY, &"/", prefix, scope_prefix.as_ref() ]
+      .iter().map(Deref::deref)
       .chain( utf8_percent_encode(&name.scoped_name,
                                   &percent_encoding::NON_ALPHANUMERIC) )
-      .chain( iter::once(suffix) )
+      .chain([ suffix ].iter().map(Deref::deref))
       .collect()
   }
   #[throws(ServerFailure)]
diff --git a/src/updates.rs b/src/updates.rs
index 86dc5441..7cdff5c9 100644
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -14,6 +14,7 @@ const RECENT_BUFFER : usize = 50;
 
 pub type PlayerUpdatesLog =
   StableIndexVecDeque<Arc<PreparedUpdate>,sse::UpdateId>;
+// xxx delete old updates at some point
 
 #[derive(Debug)]
 pub struct PlayerUpdates {