From 8c64699a3e661ad7824fef3b7d53cb5e6e47ca13 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 12 May 2021 19:28:15 +0100 Subject: [PATCH] bundles: Move Phase enum to toplevel Various other bits will want it Signed-off-by: Ian Jackson --- src/bundles.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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(id: Id, instance: &InstanceName, file: File, eh: EH, mut for_progress: &mut dyn progress::Reporter) @@ -446,12 +452,6 @@ fn parse_bundle(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, -- 2.30.2