From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 5 Mar 2021 19:37:26 +0000 (+0000)
Subject: utils: Fix Area (!)
X-Git-Tag: otter-0.4.0~243
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8e927a969543385c8168e535d736b297e888b9d6;p=otter.git

utils: Fix Area (!)

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

diff --git a/src/spec.rs b/src/spec.rs
index 3064a2eb..06af4565 100644
--- a/src/spec.rs
+++ b/src/spec.rs
@@ -363,15 +363,15 @@ pub mod implementation {
   impl<T> AreaC<T> {
     pub fn contains(&self, p: PosC<T>) -> bool where T: Ord {
       (0..2).all(|i| {
-        p.0[i] < self.0[0].0[i] ||
-        p.0[i] > self.0[1].0[i]
+        p.0[i] >= self.0[0].0[i] &&
+        p.0[i] <= self.0[1].0[i]
       })
     }
 
     pub fn overlaps(&self, other: &AreaC<T>) -> bool where T: Ord {
-      (0..2).all(|i| !(
-        other.0[1].0[i] < self.0[0].0[i] ||
-        other.0[0].0[i] > self.0[1].0[i]
+      ! (0..2).any(|i| !(
+        other.0[1].0[i] < self .0[0].0[i] ||
+        self .0[1].0[i] < other.0[0].0[i]
       ))
     }
   }