From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 16 Sep 2020 23:03:47 +0000 (+0100)
Subject: shapelib: reformat struct nfc
X-Git-Tag: otter-0.2.0~933
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b818e8900e07e09bfdd39ac882b3bfa368f467c9;p=otter.git

shapelib: reformat struct nfc

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 1a860d84..a55f25b2 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -29,13 +29,11 @@ pub struct LibraryGroupInfo {
 
 #[derive(Debug,Deserialize)]
 struct LibraryGroupSpec {
-  #[serde(flatten)]
-  pub info: Arc<LibraryGroupInfo>,
-  #[serde(default)]
-  pub stem_prefix: String,
-  #[serde(default)]
-  pub stem_suffix: String,
+  #[serde(default)] pub stem_prefix: String,
+  #[serde(default)] pub stem_suffix: String,
+  #[serde(default)] pub flip: bool,
   pub files: FileList,
+  #[serde(flatten)] pub info: Arc<LibraryGroupInfo>,
 }
 
 #[derive(Deserialize,Debug)]