|
4 | 4 | extern mod extra; |
5 | 5 |
|
6 | 6 | use std::cmp; |
| 7 | +use std::i32; |
| 8 | +use std::i64; |
7 | 9 | use extra::time::Timespec; |
8 | 10 |
|
9 | 11 | macro_rules! range( |
@@ -54,17 +56,17 @@ pub trait Normalizable { |
54 | 56 | } |
55 | 57 |
|
56 | 58 | macro_rules! bounded_normalizable( |
57 | | - ($t:ty) => ( |
| 59 | + ($t:ident) => ( |
58 | 60 | impl Normalizable for $t { |
59 | 61 | fn normalize<S: BoundSided>(bound: RangeBound<S, $t>) |
60 | 62 | -> RangeBound<S, $t> { |
61 | 63 | match (BoundSided::side(None::<S>), bound.type_) { |
62 | 64 | (Upper, Inclusive) => { |
63 | | - assert!(bound.value != Bounded::max_value()); |
| 65 | + assert!(bound.value != $t::max_value); |
64 | 66 | RangeBound::new(bound.value + 1, Exclusive) |
65 | 67 | } |
66 | 68 | (Lower, Exclusive) => { |
67 | | - assert!(bound.value != Bounded::max_value()); |
| 69 | + assert!(bound.value != $t::max_value); |
68 | 70 | RangeBound::new(bound.value + 1, Inclusive) |
69 | 71 | } |
70 | 72 | _ => bound |
@@ -281,6 +283,8 @@ impl<T: Ord+Normalizable+Clone> Range<T> { |
281 | 283 |
|
282 | 284 | #[cfg(test)] |
283 | 285 | mod test { |
| 286 | + use std::i32; |
| 287 | + |
284 | 288 | use super::*; |
285 | 289 |
|
286 | 290 | #[test] |
@@ -364,17 +368,17 @@ mod test { |
364 | 368 | let r = range!('(', 3i32 ']'); |
365 | 369 | assert!(!r.contains(&4)); |
366 | 370 | assert!(r.contains(&2)); |
367 | | - assert!(r.contains(&Bounded::min_value())); |
| 371 | + assert!(r.contains(&i32::min_value)); |
368 | 372 |
|
369 | 373 | let r = range!('[' 1i32, ')'); |
370 | | - assert!(r.contains(&Bounded::max_value())); |
| 374 | + assert!(r.contains(&i32::max_value)); |
371 | 375 | assert!(r.contains(&4)); |
372 | 376 | assert!(!r.contains(&0)); |
373 | 377 |
|
374 | 378 | let r = range!('(', ')'); |
375 | | - assert!(r.contains(&Bounded::max_value())); |
| 379 | + assert!(r.contains(&i32::max_value)); |
376 | 380 | assert!(r.contains(&0i32)); |
377 | | - assert!(r.contains(&Bounded::min_value())); |
| 381 | + assert!(r.contains(&i32::min_value)); |
378 | 382 | } |
379 | 383 |
|
380 | 384 | #[test] |
|
0 commit comments