From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 12 May 2021 18:28:15 +0000 (+0100)
Subject: bundles: Move Phase enum to toplevel
X-Git-Tag: otter-0.6.0~325
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8c64699a3e661ad7824fef3b7d53cb5e6e47ca13;p=otter.git

bundles: Move Phase enum to toplevel

Various other bits will want it

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

diff --git a/src/bundles.rs b/src/bundles.rs
index da0ac2d7..c4399d72 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -435,6 +435,12 @@ impl BundleParseErrorHandling for BundleParseUpload {
   }
 }
 
+#[derive(Copy,Clone,Debug,EnumCount,EnumMessage,ToPrimitive)]
+enum Phase {
+  #[strum(message="scan")]                   Scan,
+  #[strum(message="parse shape catalogues")] ParseLibs,
+}
+
 #[throws(EH::Err)]
 fn parse_bundle<EH>(id: Id, instance: &InstanceName, file: File, eh: EH,
                     mut for_progress: &mut dyn progress::Reporter)
@@ -446,12 +452,6 @@ fn parse_bundle<EH>(id: Id, instance: &InstanceName, file: File, eh: EH,
     IndexedZip::new(file)
   })?;
 
-  #[derive(Copy,Clone,Debug,EnumCount,EnumMessage,ToPrimitive)]
-  enum Phase {
-    #[strum(message="scan")] Scan,
-    #[strum(message="parse shape catalogues")] ParseLibs,
-  }
-
   #[derive(Copy,Clone,Debug,EnumCount,EnumMessage,ToPrimitive)]
   enum ToScan {
     #[strum(message="metadata")]   Meta,