bundles: Use ReloadError for reload

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

diff --git a/src/bundles.rs b/src/bundles.rs
index c4d5c63972c13ab49e18e4b4726fbf04fab7eba4..3e84ffb6b2fccb3ea20d6d5555135548bc6399d5 100644 (file)
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -475,13 +475,12 @@ impl InstanceBundles {
         ib.bundles.resize_with(iu+1, default);
       }
 
-      let parsed = match parse_bundle(id, &mut file, fpath) {
+      let parsed = match parse_bundle::<ReloadError>(id, &mut file, fpath) {
         Ok(y) => y,
-        Err(LE::BadBundle(why)) => {
-          debug!("bundle file {:?} bad {}", &fpath, why);
+        Err(e) => {
+          debug!("bundle file {:?} reload failed {}", &fpath, e);
           continue;
         }
-        Err(LE::IE(ie)) => throw!(ie),
       };
 
       incorporate_bundle(&mut ib, ig, id, parsed)?;