From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 15 May 2021 10:54:26 +0000 (+0100)
Subject: Revert "libraries: LibraryItemNotPrepared: Make this a separate error"
X-Git-Tag: otter-0.6.0~293
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8a225671ce01dd59e9d6679782a63597d05677e2;p=otter.git

Revert "libraries: LibraryItemNotPrepared: Make this a separate error"

We're going to always prepare things on loading, so we don't need this.

This reverts commit f580502d464611e7c0a5c3085f5a9be71979bfdf.
---

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 9d240b37..9834e875 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -412,7 +412,7 @@ impl Contents {
         warn!("library item lib={} itme={} for={:?} data file {:?} not found",
               &self.libname, item_name, item_for, &svg_path);
         let spec_for = ItemSpec::from_strs(lib_name_for, item_for);
-        SpE::LibraryItemNotPrepared(spec_for)
+        SpE::LibraryItemNotFound(spec_for)
       } else {
         let m = "error accessing/reading library item data file";
         error!("{}: {} {:?}: {}", &m, &svg_path, item_for, &e);
@@ -517,7 +517,6 @@ impl Contents {
                    &Instance::dummy(), SpecDepth::zero())
       {
         Err(SpecError::LibraryItemNotFound(_)) => continue,
-        Err(SpecError::LibraryItemNotPrepared(_)) => continue,
         e@ Err(_) => e?,
         Ok(r) => r,
       };
diff --git a/src/spec.rs b/src/spec.rs
index 017b9b22..9eb59dcb 100644
--- a/src/spec.rs
+++ b/src/spec.rs
@@ -67,7 +67,6 @@ pub enum SpecError {
   PosOffTable,
   LibraryNotFound,
   LibraryItemNotFound(ItemSpec),
-  LibraryItemNotPrepared(ItemSpec),
   AclInvalidAccountGlob,
   AclEntryOverlappingAllowDeny,
   InconsistentPieceCount,