Fix for upstream changes

sfackler · sfackler · commit 850982c0b0d0 · 2014-03-14T20:19:57.000-07:00
diff --git 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()))
     }

Original file line number	Diff line number	Diff line change
`@@ -384,10 +384,10 @@ impl<T: Ord+Normalizable+Clone> Range<T> {`
`384`	`384`	`return Range::empty();`
`385`	`385`	`}`
`386`	`386`
`387`		`- let OptBound(lower) = cmp::max(OptBound(self.lower()),`
`388`		`- OptBound(other.lower()));`
`389`		`- let OptBound(upper) = cmp::min(OptBound(self.upper()),`
`390`		`- OptBound(other.upper()));`
	`387`	`+ let (_, OptBound(lower)) = order(OptBound(self.lower()),`
	`388`	`+ OptBound(other.lower()));`
	`389`	`+ let (OptBound(upper), _) = order(OptBound(self.upper()),`
	`390`	`+ OptBound(other.upper()));`
`391`	`391`
`392`	`392`	`Range::new(lower.map(\|v\| v.clone()), upper.map(\|v\| v.clone()))`
`393`	`393`	`}`