From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 10 May 2021 00:04:41 +0000 (+0100)
Subject: bundles: Use ReloadError for reload
X-Git-Tag: otter-0.6.0~361
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=508dc64f5fec5c14d8a7f32e900f786c0b48ca92;p=otter.git

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 c4d5c639..3e84ffb6 100644
--- 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)?;