geometry: Rename Region::Rectangle to Rect

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

diff --git a/base/geometry.rs b/base/geometry.rs
index b0b9318f85715c64979c20e589d9ed206e4769fa..c8fb8a13926791fb54cb8ff40df77a88b37b8da9 100644 (file)
--- a/base/geometry.rs
+++ b/base/geometry.rs
@@ -280,7 +280,7 @@ fn empty_area() {
 
 #[derive(Clone,Debug,Serialize,Deserialize)]
 pub enum RegionC<T:Copy> {
-  Rectangle(RectC<T>),
+  Rect(RectC<T>),
 }
 pub type Region = RegionC<Coord>;
 
@@ -288,19 +288,19 @@ impl<T:Copy> RegionC<T> {
   pub fn contains(&self, pos: PosC<T>) -> bool where T: PartialOrd {
     use RegionC::*;
     match &self {
-      Rectangle(a) => a.contains(pos),
+      Rect(a) => a.contains(pos),
     }
   }
 
   pub fn overlaps(&self, other: &RegionC<T>) -> bool where T: PartialOrd {
     use RegionC::*;
     match (self, other) {
-      (Rectangle(a), Rectangle(b)) => a.overlaps(b)
+      (Rect(a), Rect(b)) => a.overlaps(b)
     }
   }
 
   pub fn empty() -> Self where T: Copy + num_traits::Zero + num_traits::One {
-    RegionC::Rectangle(RectC::empty())
+    RegionC::Rect(RectC::empty())
   }
 
 }

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 34242520ae067be5dc1aaf4e428e8af4ba345c20..ae3979398a166ccfb3fdc8bd08193ef337db5884 100644 (file)
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -799,7 +799,7 @@ impl Rectangle {
 
   #[throws(CoordinateOverflow)]
   pub fn region(&self, centre: Pos) -> Region {
-    Region::Rectangle(self.rect(centre)?)
+    Region::Rect(self.rect(centre)?)
   }
 }