Use cmp::min instead of manual if-else

faern · tesuji · faern · commit ab389e5ed8e1 · 2020-01-06T16:37:09.000+01:00
Co-Authored-By: lzutao &lt;taolzu@gmail.com&gt;
diff --git a/src/libstd/sys/unix/condvar.rs b/src/libstd/sys/unix/condvar.rs
@@ -13,7 +13,7 @@ const TIMESPEC_MAX: libc::timespec =
     libc::timespec { tv_sec: <libc::time_t>::MAX, tv_nsec: 1_000_000_000 - 1 };
 
 fn saturating_cast_to_time_t(value: u64) -> libc::time_t {
-    if value > <libc::time_t>::MAX as u64 { <libc::time_t>::MAX } else { value as libc::time_t }
+    crate::cmp::min(value, libc::time_t::MAX as u64) as _
 }
 
 impl Condvar {
diff --git a/src/libstd/sys/vxworks/condvar.rs b/src/libstd/sys/vxworks/condvar.rs
@@ -13,7 +13,7 @@ const TIMESPEC_MAX: libc::timespec =
     libc::timespec { tv_sec: <libc::time_t>::MAX, tv_nsec: 1_000_000_000 - 1 };
 
 fn saturating_cast_to_time_t(value: u64) -> libc::time_t {
-    if value > <libc::time_t>::MAX as u64 { <libc::time_t>::MAX } else { value as libc::time_t }
+    crate::cmp::min(value, libc::time_t::MAX as u64) as _
 }
 
 impl Condvar {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ const TIMESPEC_MAX: libc::timespec =`
`13`	`13`	`libc::timespec { tv_sec: <libc::time_t>::MAX, tv_nsec: 1_000_000_000 - 1 };`
`14`	`14`
`15`	`15`	`fn saturating_cast_to_time_t(value: u64) -> libc::time_t {`
`16`		`- if value > <libc::time_t>::MAX as u64 { <libc::time_t>::MAX } else { value as libc::time_t }`
	`16`	`+ crate::cmp::min(value, libc::time_t::MAX as u64) as _`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`impl Condvar {`