From 8dfbefa619333b152a38079a49f115ae404e4f87 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 5 May 2021 13:56:30 +0100 Subject: [PATCH] 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 --- src/shapelib.rs | 6 ------ src/spec.rs | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/shapelib.rs b/src/shapelib.rs index c379b156..ef68ab17 100644 --- 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 8b707c21..5429903d 100644 --- 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::*; -- 2.30.2