utils: Fix Area (!)

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

diff --git a/src/spec.rs b/src/spec.rs
index 3064a2ebcd392aa40391daed876629a74f7e0df0..06af4565850402581646b5e345ba960d6be9b7be 100644 (file)
--- 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]
       ))
     }
   }