@@ -76,7 +76,7 @@ pub(crate) mod timer {
76
76
77
77
/// An enumeration allowing the definition of the expiration time of an alarm,
78
78
/// recurring or not.
79
- #[ derive( Debug , Clone , Copy , PartialEq ) ]
79
+ #[ derive( Debug , Clone , Copy , Eq , PartialEq ) ]
80
80
pub enum Expiration {
81
81
/// Alarm will trigger once after the time given in `TimeSpec`
82
82
OneShot ( TimeSpec ) ,
@@ -243,7 +243,7 @@ impl PartialOrd for TimeSpec {
243
243
impl TimeValLike for TimeSpec {
244
244
#[ inline]
245
245
fn seconds ( seconds : i64 ) -> TimeSpec {
246
- assert ! ( seconds >= TS_MIN_SECONDS && seconds <= TS_MAX_SECONDS ,
246
+ assert ! ( ( TS_MIN_SECONDS ..= TS_MAX_SECONDS ) . contains ( & seconds ) ,
247
247
"TimeSpec out of bounds; seconds={}" , seconds) ;
248
248
#[ cfg_attr( target_env = "musl" , allow( deprecated) ) ] // https://github.com/rust-lang/libc/issues/1848
249
249
TimeSpec ( timespec { tv_sec : seconds as time_t , tv_nsec : 0 } )
@@ -270,7 +270,7 @@ impl TimeValLike for TimeSpec {
270
270
#[ inline]
271
271
fn nanoseconds ( nanoseconds : i64 ) -> TimeSpec {
272
272
let ( secs, nanos) = div_mod_floor_64 ( nanoseconds, NANOS_PER_SEC ) ;
273
- assert ! ( secs >= TS_MIN_SECONDS && secs <= TS_MAX_SECONDS ,
273
+ assert ! ( ( TS_MIN_SECONDS ..= TS_MAX_SECONDS ) . contains ( & secs ) ,
274
274
"TimeSpec out of bounds" ) ;
275
275
#[ cfg_attr( target_env = "musl" , allow( deprecated) ) ] // https://github.com/rust-lang/libc/issues/1848
276
276
TimeSpec ( timespec { tv_sec : secs as time_t ,
@@ -456,7 +456,7 @@ impl PartialOrd for TimeVal {
456
456
impl TimeValLike for TimeVal {
457
457
#[ inline]
458
458
fn seconds ( seconds : i64 ) -> TimeVal {
459
- assert ! ( seconds >= TV_MIN_SECONDS && seconds <= TV_MAX_SECONDS ,
459
+ assert ! ( ( TV_MIN_SECONDS ..= TV_MAX_SECONDS ) . contains ( & seconds ) ,
460
460
"TimeVal out of bounds; seconds={}" , seconds) ;
461
461
#[ cfg_attr( target_env = "musl" , allow( deprecated) ) ] // https://github.com/rust-lang/libc/issues/1848
462
462
TimeVal ( timeval { tv_sec : seconds as time_t , tv_usec : 0 } )
@@ -474,7 +474,7 @@ impl TimeValLike for TimeVal {
474
474
#[ inline]
475
475
fn microseconds ( microseconds : i64 ) -> TimeVal {
476
476
let ( secs, micros) = div_mod_floor_64 ( microseconds, MICROS_PER_SEC ) ;
477
- assert ! ( secs >= TV_MIN_SECONDS && secs <= TV_MAX_SECONDS ,
477
+ assert ! ( ( TV_MIN_SECONDS ..= TV_MAX_SECONDS ) . contains ( & secs ) ,
478
478
"TimeVal out of bounds" ) ;
479
479
#[ cfg_attr( target_env = "musl" , allow( deprecated) ) ] // https://github.com/rust-lang/libc/issues/1848
480
480
TimeVal ( timeval { tv_sec : secs as time_t ,
@@ -487,7 +487,7 @@ impl TimeValLike for TimeVal {
487
487
fn nanoseconds ( nanoseconds : i64 ) -> TimeVal {
488
488
let microseconds = nanoseconds / 1000 ;
489
489
let ( secs, micros) = div_mod_floor_64 ( microseconds, MICROS_PER_SEC ) ;
490
- assert ! ( secs >= TV_MIN_SECONDS && secs <= TV_MAX_SECONDS ,
490
+ assert ! ( ( TV_MIN_SECONDS ..= TV_MAX_SECONDS ) . contains ( & secs ) ,
491
491
"TimeVal out of bounds" ) ;
492
492
#[ cfg_attr( target_env = "musl" , allow( deprecated) ) ] // https://github.com/rust-lang/libc/issues/1848
493
493
TimeVal ( timeval { tv_sec : secs as time_t ,
0 commit comments