From a6e5fb22511c77234624f5bec4123dc7d5cb16b7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 4 May 2022 19:53:44 +0100 Subject: [PATCH] size handling: Rename OutlineCalculable::err_mapper I think this is a less confusing name. Signed-off-by: Ian Jackson --- src/shapelib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/shapelib.rs b/src/shapelib.rs index 61b363c7..e92b7ba8 100644 --- a/src/shapelib.rs +++ b/src/shapelib.rs @@ -221,7 +221,7 @@ impl SvgBaseName where T: Borrow { } impl OutlineCalculable { - pub fn map_err(&self) -> impl Fn(LLE) -> IE { + pub fn err_mapper(&self) -> impl Fn(LLE) -> IE { |e| internal_logic_error(format!( "outline calculable but failed {} {:?}",&e,&e )) @@ -567,10 +567,10 @@ impl Contents { -> ItemSpecLoaded { let (svg_data, svg_sz) = self.load_svg(name, lib_name, &**name)?; let outline = idata.group.d.outline.load(&idata.group, svg_sz) - .map_err(idata.outline_calculable.map_err())?; + .map_err(idata.outline_calculable.err_mapper())?; let xform = FaceTransform::from_group(&idata.group.d) - .map_err(idata.outline_calculable.map_err())?; + .map_err(idata.outline_calculable.err_mapper())?; let mut svgs = IndexVec::with_capacity(1); let svg = svgs.push(svg_data); @@ -617,9 +617,9 @@ impl Contents { /* original: */ lib_name, name.as_str() )?; let outline = idata.group.d.outline.load(&idata.group, occ_svg_sz) - .map_err(idata.outline_calculable.map_err())?; + .map_err(idata.outline_calculable.err_mapper())?; let xform = FaceTransform::from_group(&idata.group.d) - .map_err(idata.outline_calculable.map_err())?; + .map_err(idata.outline_calculable.err_mapper())?; let loaded = OccInertLoaded { svgd, outline, -- 2.30.2