formatting, some from rustfmt (manually picked)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/pieces.rs b/src/pieces.rs
index 6d63191cb1b2dd7adaa5c6085df18bc26c57017e..82d519707c63ff07bc9b306a56197889878037aa 100644 (file)
--- a/src/pieces.rs
+++ b/src/pieces.rs
@@ -126,7 +126,7 @@ impl Piece for SimpleShape {
            self.colours[pri.face].0,
            &self.path.0)?;
   }
-  fn describe_html(&self, face : Option<FaceId>) -> Html {
+  fn describe_html(&self, face: Option<FaceId>) -> Html {
     Html(if let Some(face) = face {
       format!("a {} {}", self.colours[face].0, self.desc.0)
     } else {

diff --git a/src/session.rs b/src/session.rs
index 8466e84906533b24065e41d7c0cd8636ad765f72..9ed70cf098960032877077f32b5d250af8b927ba 100644 (file)
--- a/src/session.rs
+++ b/src/session.rs
@@ -7,17 +7,17 @@ use crate::imports::*;
 #[derive(Serialize,Debug)]
 struct SessionRenderContext {
   table_colour: Colour,
-  ptoken : RawToken,
-  ctoken : RawToken,
-  player : PlayerId,
-  gen : Generation,
-  table_size : Pos,
-  uses : Vec<SessionPieceContext>,
-  defs : Vec<(VisiblePieceId,Html)>,
-  nick : String,
-  load : String,
-  log : Vec<SessionFormattedLogEntry>,
-  sse_url_prefix : String,
+  ptoken: RawToken,
+  ctoken: RawToken,
+  player: PlayerId,
+  gen: Generation,
+  table_size: Pos,
+  uses: Vec<SessionPieceContext>,
+  defs: Vec<(VisiblePieceId, Html)>,
+  nick: String,
+  load: String,
+  log: Vec<SessionFormattedLogEntry>,
+  sse_url_prefix: String,
 }
 
 #[derive(Debug,Serialize)]
@@ -35,22 +35,22 @@ struct SessionPieceContext {
 
 #[derive(Serialize,Debug)]
 struct SessionPieceLoadJson<'r> {
-  held : &'r Option<PlayerId>,
-  z : ZCoord,
-  zg : Generation,
-  pinned : bool,
+  held: &'r Option<PlayerId>,
+  z: ZCoord,
+  zg: Generation,
+  pinned: bool,
   uos: &'r [UoDescription],
 }
 
 #[derive(Serialize,Debug)]
 struct DataLoad {
   last_log_ts: String,
-  players : HashMap<PlayerId, DataLoadPlayer>,
+  players: HashMap<PlayerId, DataLoadPlayer>,
 }
 
 #[derive(Deserialize)]
 struct SessionForm {
-  ptoken : RawToken,
+  ptoken: RawToken,
 }
 #[post("/_/session/<layout>", format="json", data="<form>")]
 fn session(form : Json<SessionForm>, layout: Option<PresentationLayout>)
@@ -88,7 +88,7 @@ fn session(form : Json<SessionForm>, layout: Option<PresentationLayout>)
       gpl.layout = layout;
     }
     let layout = gpl.layout;
-    let mut pieces : Vec<_> = ig.gs.pieces.iter().collect();
+    let mut pieces: Vec<_> = ig.gs.pieces.iter().collect();
 
     pieces.sort_by_key(|(_,pr)| &pr.zlevel);