chiark / gitweb /
warning fixes
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 18 Jul 2020 10:31:25 +0000 (11:31 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 18 Jul 2020 10:31:25 +0000 (11:31 +0100)
src/error.rs
src/global.rs
src/http.rs

index 380f5ed697d779403c76f0a17fcaecec08c01986..aed9e2960f585287d189b5dc2b9042c0ce308c14 100644 (file)
@@ -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};
index 35526835d9033e8398104be2e7c91100d3da9af2..90888175e8feb28acea18f8898cd81713ec83a5c 100644 (file)
@@ -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);
   }
 
index 974bdb742de49f0dc88ac022ac36df7cc95bbd33..d03ef869bece1ed42727f399944d63a98dadf5cf 100644 (file)
@@ -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,