From 32e86c82500f4173e8df9186b902f3d06d3474d2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 25 Mar 2021 11:06:00 +0000
Subject: [PATCH] rename Region to RegionC, in line with PosC and AreaC

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 base/geometry.rs  | 13 +++++++------
 daemon/session.rs |  2 +-
 src/hidden.rs     |  6 +++---
 src/shapelib.rs   |  2 +-
 src/updates.rs    |  2 +-
 wasm/wasm.rs      |  6 +++---
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/base/geometry.rs b/base/geometry.rs
index 164b0fe7..219ff901 100644
--- a/base/geometry.rs
+++ b/base/geometry.rs
@@ -240,27 +240,28 @@ fn empty_area() {
 // ---------- Region ----------
 
 #[derive(Clone,Debug,Serialize,Deserialize)]
-pub enum Region<T> {
+pub enum RegionC<T> {
   Rectangle(AreaC<T>),
 }
+pub type Region = RegionC<Coord>;
 
-impl<T> Region<T> {
+impl<T> RegionC<T> {
   pub fn contains(&self, pos: PosC<T>) -> bool where T: PartialOrd {
-    use Region::*;
+    use RegionC::*;
     match &self {
       Rectangle(a) => a.contains(pos),
     }
   }
 
-  pub fn overlaps(&self, other: &Region<T>) -> bool where T: PartialOrd {
-    use Region::*;
+  pub fn overlaps(&self, other: &RegionC<T>) -> bool where T: PartialOrd {
+    use RegionC::*;
     match (self, other) {
       (Rectangle(a), Rectangle(b)) => a.overlaps(b)
     }
   }
 
   pub fn empty() -> Self where T: Copy + num_traits::Zero + num_traits::One {
-    Region::Rectangle(AreaC::empty())
+    RegionC::Rectangle(AreaC::empty())
   }
 
 }
diff --git a/daemon/session.rs b/daemon/session.rs
index 0164b789..2a9d33c4 100644
--- a/daemon/session.rs
+++ b/daemon/session.rs
@@ -49,7 +49,7 @@ struct SessionPieceLoadJson<'r> {
   desc: Html,
   uos: &'r [UoDescription],
   moveable: PieceMoveable,
-  occregion: Option<&'r Region<Coord>>,
+  occregion: Option<&'r Region>,
 }
 
 #[derive(Serialize,Debug)]
diff --git a/src/hidden.rs b/src/hidden.rs
index cfa37763..956b3969 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -43,7 +43,7 @@ struct Passive {
 
 #[derive(Clone,Debug,Serialize,Deserialize)]
 pub struct Occultation {
-  region: Region<Coord>, // automatically affect pieces here
+  region: Region, // automatically affect pieces here
   occulter: PieceId, // kept in synch with PieceOccult::active
   notches: Notches, // kept in synch with PieceOccult::passive
   ppiece_use_size: Pos, // taken from first piece
@@ -108,7 +108,7 @@ impl PieceOccult {
 
   #[throws(IE)]
   pub fn active_region<'r>(&'r self, goccults: &'r GameOccults)
-                           -> Option<&'r Region<Coord>> {
+                           -> Option<&'r Region> {
     self.active_occ(goccults)?.map(
       |occ| &occ.region
     )
@@ -824,7 +824,7 @@ pub fn create_occultation(
   ipieces: &IPieces,
   ioccults: &IOccults,
   to_recalculate: &mut ToRecalculate,
-  region: Region<Coord>,
+  region: Region,
   occulter: PieceId,
   views: OccultationViews,
 ) -> Vec<(PieceId, PieceUpdateOps)> {
diff --git a/src/shapelib.rs b/src/shapelib.rs
index f08dba75..619b5f55 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -798,7 +798,7 @@ impl Rectangle {
   }
 
   #[throws(CoordinateOverflow)]
-  pub fn region(&self, centre: Pos) -> Region<Coord> {
+  pub fn region(&self, centre: Pos) -> Region {
     Region::Rectangle(self.area(centre)?)
   }
 }
diff --git a/src/updates.rs b/src/updates.rs
index ddeea607..d909677b 100644
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -107,7 +107,7 @@ pub struct PreparedPieceState {
   pub pinned: bool,
   pub moveable: PieceMoveable,
   pub uos: Vec<UoDescription>,
-  pub occregion: Option<Region<Coord>>,
+  pub occregion: Option<Region>,
 }
 
 #[derive(Debug,Copy,Clone,Serialize,Deserialize,Eq)]
diff --git a/wasm/wasm.rs b/wasm/wasm.rs
index 061bf2be..d92a50a1 100644
--- a/wasm/wasm.rs
+++ b/wasm/wasm.rs
@@ -14,7 +14,7 @@ use wasm_bindgen::prelude::*;
 
 use otter_base::imports::serde_json;
 
-use otter_base::geometry::{PosC,Region};
+use otter_base::geometry::{PosC,RegionC};
 use otter_base::zcoord;
 use otter_base::misc as base_misc;
 use zcoord::{Mutable,ZCoord};
@@ -145,7 +145,7 @@ pub struct BadRegionArguments;
 type Number = f64;
 
 #[wasm_bindgen]
-pub struct RegionList(HashMap<String, Region<Number>>);
+pub struct RegionList(HashMap<String, RegionC<Number>>);
 
 #[wasm_bindgen]
 pub fn empty_region_list() -> RegionList { RegionList(default()) }
@@ -157,7 +157,7 @@ impl RegionList {
   {
     let piece  = piece .as_string().ok_or(BadRegionArguments).e()?;
     let region = region.as_string().ok_or(BadRegionArguments).e()?;
-    let region: Region<Number> = serde_json::from_str(&region)
+    let region: RegionC<Number> = serde_json::from_str(&region)
       .map_err(|_| BadRegionArguments).e()?;
     self.0.insert(piece, region);
     Ok(())
-- 
2.30.2