From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 18 Jul 2020 10:31:25 +0000 (+0100)
Subject: warning fixes
X-Git-Tag: otter-0.2.0~1306
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d014914c8c34d66b0597e1e641a795c77a798b6a;p=otter.git

warning fixes
---

diff --git a/src/error.rs b/src/error.rs
index 380f5ed6..aed9e296 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -26,8 +26,10 @@ pub enum OnlineError {
   JSONSerializeFailed(#[from] serde_json::error::Error),
   #[error("SVG processing/generation error {0:?}")]
   SVGProcessingFailed(#[from] SVGProcessingError),
-  #[error("IO error in server {0:?}")]
+  #[error("Server IO error {0:?}")]
   ServerIOError(#[from] io::Error),
+  #[error("Server MessagePack encoding error {0:?}")]
+  ServerMessagePackEncodeFail(#[from] rmp_serde::encode::Error),
 }
 
 pub use OnlineError::{NoClient,NoPlayer};
diff --git a/src/global.rs b/src/global.rs
index 35526835..90888175 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -2,6 +2,7 @@
 use crate::imports::*;
 use lazy_static::lazy_static;
 
+#[allow(dead_code)]
 const SAVE_DIRECTORY : &str = "save";
 
 // ---------- newtypes and type aliases ----------
@@ -164,7 +165,7 @@ impl InstanceGuard<'_> {
       .chain( iter::once(".tmp") )
       .collect();
     let mut f = BufWriter::new(fs::File::create(&savefile)?);
-    rmp_serde::encode::write_named(&mut f, &self.ig.gs);
+    rmp_serde::encode::write_named(&mut f, &self.ig.gs)?;
     eprintln!("xxx saved {} to {}!", self.name, &savefile);
   }
 
diff --git a/src/http.rs b/src/http.rs
index 974bdb74..d03ef869 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -15,7 +15,7 @@ impl<'r> Responder<'r> for OnlineError {
     use OnlineError::*;
     let status = match self {
       GameCorrupted | JSONSerializeFailed(_) | SVGProcessingFailed(_)
-        | ServerIOError(_)
+        | ServerIOError(_) | ServerMessagePackEncodeFail(_)
         => Status::InternalServerError,
       NoClient | NoPlayer => Status::NotFound,
       InvalidZCoord => Status::BadRequest,