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 da0ac2d7b8d8d7cdb9c0dcc527eecc7a7429a73d..c4399d72557179e0733d8a757a4ee116e06ca46b 100644 (file)
--- 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,