shapelib: Move ItemSpec to specs.rs

This logically belongs here (and we are going to want to refer to it
from one of the SpecErrors).

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index c379b156b07a2b16571e441af4feace46b70eeb8..ef68ab1793e8cc5eadbb577942ec99532218dff1 100644 (file)
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -129,12 +129,6 @@ const INHERIT_DEPTH_LIMIT: u8 = 20;
 
 type TV = toml::Value;
 
-#[derive(Debug,Clone,Serialize,Deserialize)]
-pub struct ItemSpec {
-  pub lib: String,
-  pub item: String,
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct MultiSpec {
   pub lib: String,

diff --git a/src/spec.rs b/src/spec.rs
index 8b707c2134b8581a6de6ad36d190f6c9e03b0675..5429903da138b8bb7b31b86943c5d5b9f37d9807 100644 (file)
--- a/src/spec.rs
+++ b/src/spec.rs
@@ -204,7 +204,13 @@ pub enum PieceAngle {
 pub struct CompassAngle(u8);
 
 //---------- Piece specs ----------
-// the implementations are in pieces.rs
+// the implementations are in shapelib.rs and pieces.rs
+
+#[derive(Debug,Clone,Serialize,Deserialize)]
+pub struct ItemSpec {
+  pub lib: String,
+  pub item: String,
+}
 
 mod outline {
   use super::*;