chiark
/
gitweb
/
~ianmdlvl
/
otter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
621f14f
)
shapelib: wip, compiles, remove an xxx
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 23 Sep 2020 22:11:35 +0000
(23:11 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 23 Sep 2020 22:11:35 +0000
(23:11 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/shapelib.rs
patch
|
blob
|
history
diff --git
a/src/shapelib.rs
b/src/shapelib.rs
index a00af8925b5841e76f6058a6158bbbc5d22aa19c..c244cf70482529e9dacf5dc06eac427c9ca95f21 100644
(file)
--- a/
src/shapelib.rs
+++ b/
src/shapelib.rs
@@
-165,16
+165,6
@@
impl Piece for Item {
}
}
-/*
-#[typetag::serde(name="LP")]
-impl Item for LibraryItem {
-}
-*/
-
-/*
-#[typetag::serde(name="Lib")]
-impl PieceSpec for LibPieceSpec {
-*/
impl ItemSpec {
fn load(&self) -> Result<Box<dyn Piece>,SpecError> {
let libs = GLOBAL.shapelibs.read().unwrap();
@@
-205,8
+195,7
@@
impl ItemSpec {
let face = ItemFace { svg: Html(svg_data), desc, centre, scale };
let faces = index_vec![ face ];
let it = Item { faces, descs, outline, desc_hidden };
- Box::new(it);
- panic!(); //xxx
+ Ok(Box::new(it))
}
}