From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 May 2022 20:54:02 +0000 (+0100)
Subject: Switch to deriving Deref
X-Git-Tag: otter-1.1.0~284
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7954158a76acba2fc36fd6f0acf42a2af3555f80;p=otter.git

Switch to deriving Deref

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 6ec011b3..fdd83952 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -189,7 +189,7 @@ struct ItemInertForOcculted {
 
 /// Represents a `T` which is an SVG basename which has been noted
 /// for processing during bundle load.
-#[derive(Debug,Copy,Clone,Hash,Eq,PartialEq,Ord,PartialOrd)]
+#[derive(Debug,Copy,Clone,Hash,Eq,PartialEq,Ord,PartialOrd,Deref)]
 #[repr(transparent)]
 struct SvgBaseName<T:?Sized>(T);
 impl<T> Display for SvgBaseName<T> where T: Display + ?Sized {
@@ -210,7 +210,6 @@ impl<T> SvgBaseName<T> where T: ?Sized {
     u
   }
 }
-deref_to_field!{{ T: ?Sized } SvgBaseName<T>, T, 0 }
 impl<T> SvgBaseName<T> where T: Borrow<GoodItemName> {
   #[throws(SubstError)]
   fn note(src: &mut dyn LibrarySource, i: T,