From 850982c0b0d0a0078f4a46724b52c5ebd088e463 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Fri, 14 Mar 2014 20:19:57 -0700
Subject: [PATCH] Fix for upstream changes

---
 src/types/range.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/types/range.rs b/src/types/range.rs
index 3201969f..9e0cbed4 100644
--- a/src/types/range.rs
+++ b/src/types/range.rs
@@ -384,10 +384,10 @@ impl<T: Ord+Normalizable+Clone> Range<T> {
             return Range::empty();
         }
 
-        let OptBound(lower) = cmp::max(OptBound(self.lower()),
-                                       OptBound(other.lower()));
-        let OptBound(upper) = cmp::min(OptBound(self.upper()),
-                                       OptBound(other.upper()));
+        let (_, OptBound(lower)) = order(OptBound(self.lower()),
+                                         OptBound(other.lower()));
+        let (OptBound(upper), _) = order(OptBound(self.upper()),
+                                         OptBound(other.upper()));
 
         Range::new(lower.map(|v| v.clone()), upper.map(|v| v.clone()))
     }